Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Collins <bmc@hopper.(none)>2004-01-25 06:55:24 -0500
committerBen Collins <bmc@hopper.(none)>2004-01-25 06:55:24 -0500
commit401dcad18db7524c39a2a5cad67c5459d76af1c2 (patch)
tree6ec5bf1ee8b0be3b7898dbb57c7717fca628943e
parent7a63bfcdbf096f55cdc10d32da4d1746da2bf3ba (diff)
parentb3c2a3a4cd75096a67b395d2a6ab02ed60a6c7df (diff)
Merge http://linux.bkbits.net/linux-2.5
into hopper.(none):/usr/src/kernel/linux-2.6
-rw-r--r--drivers/ide/ide-disk.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/ide/ide-disk.c b/drivers/ide/ide-disk.c
index 4d5ad566a40c..ac2a3ec078ec 100644
--- a/drivers/ide/ide-disk.c
+++ b/drivers/ide/ide-disk.c
@@ -1605,8 +1605,8 @@ static void idedisk_setup (ide_drive_t *drive)
if (drive->addressing == 0 && drive->capacity64 > 1ULL << 28) {
printk("%s: cannot use LBA48 - full capacity "
"%llu sectors (%llu MB)\n",
- drive->name,
- drive->capacity64, sectors_to_MB(drive->capacity64));
+ drive->name, (unsigned long long)drive->capacity64,
+ sectors_to_MB(drive->capacity64));
drive->capacity64 = 1ULL << 28;
}