aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ide
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2011-06-14 15:15:49 +0900
committerPaul Mundt <lethal@linux-sh.org>2011-06-14 15:15:49 +0900
commit9aa7719e0c6a1580451900e672744752804f8f75 (patch)
treeba36c5536342db2759d0a1843dffd0c193e26ff0 /drivers/ide
parent583af252ab07cd1e8721878463da5b7016c18fdc (diff)
parent2c53b436a30867eb6b47dd7bab23ba638d1fb0d2 (diff)
downloadkernel_samsung_smdk4412-9aa7719e0c6a1580451900e672744752804f8f75.zip
kernel_samsung_smdk4412-9aa7719e0c6a1580451900e672744752804f8f75.tar.gz
kernel_samsung_smdk4412-9aa7719e0c6a1580451900e672744752804f8f75.tar.bz2
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into sh-fixes-for-linus
Diffstat (limited to 'drivers/ide')
-rw-r--r--drivers/ide/ide-cd.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/ide/ide-cd.c b/drivers/ide/ide-cd.c
index 144d272..04b0956 100644
--- a/drivers/ide/ide-cd.c
+++ b/drivers/ide/ide-cd.c
@@ -778,7 +778,8 @@ static ide_startstop_t ide_cd_do_request(ide_drive_t *drive, struct request *rq,
sector_t block)
{
struct ide_cmd cmd;
- int uptodate = 0, nsectors;
+ int uptodate = 0;
+ unsigned int nsectors;
ide_debug_log(IDE_DBG_RQ, "cmd: 0x%x, block: %llu",
rq->cmd[0], (unsigned long long)block);