Skip to content

L
linux
Commit 2245f332 authored by David S. Miller's avatar David S. Miller Committed by David S. Miller
Browse files
Options

Merge nuts.ninka.net:/disk1/davem/BK/network-2.6 

into nuts.ninka.net:/disk1/davem/BK/net-2.6
parents 10e647fa 76c403c4
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
Makefile
View file @ 2245f332
VERSION = 2 VERSION = 2
PATCHLEVEL = 6 PATCHLEVEL = 6
SUBLEVEL = 2 SUBLEVEL = 2
EXTRAVERSION =-rc1 EXTRAVERSION =-rc2
# *DOCUMENTATION* # *DOCUMENTATION*
# To see a list of typical targets execute "make help" # To see a list of typical targets execute "make help"
......
drivers/ide/ide-disk.c
View file @ 2245f332
...@@ -1605,8 +1605,8 @@ static void idedisk_setup (ide_drive_t *drive) ...@@ -1605,8 +1605,8 @@ static void idedisk_setup (ide_drive_t *drive)
if (drive->addressing == 0 && drive->capacity64 > 1ULL << 28) { if (drive->addressing == 0 && drive->capacity64 > 1ULL << 28) {
printk("%s: cannot use LBA48 - full capacity " printk("%s: cannot use LBA48 - full capacity "
"%llu sectors (%llu MB)\n", "%llu sectors (%llu MB)\n",
drive->name, drive->name, (unsigned long long)drive->capacity64,
drive->capacity64, sectors_to_MB(drive->capacity64)); sectors_to_MB(drive->capacity64));
drive->capacity64 = 1ULL << 28; drive->capacity64 = 1ULL << 28;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7