diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-10-14 20:31:54 -0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-10-14 20:31:54 -0400 |
| commit | 6dc6472581f693b5fc95aebedf67b4960fb85cf0 (patch) | |
| tree | 06a5a9a08519950575505273eabced331ed51405 /drivers/block/ataflop.c | |
| parent | ee673eaa72d8d185012b1027a05e25aba18c267f (diff) | |
| parent | 8acd3a60bcca17c6d89c73cee3ad6057eb83ba1e (diff) | |
Merge commit 'origin'
Manual fixup of conflicts on:
arch/powerpc/include/asm/dcr-regs.h
drivers/net/ibm_newemac/core.h
Diffstat (limited to 'drivers/block/ataflop.c')
| -rw-r--r-- | drivers/block/ataflop.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/block/ataflop.c b/drivers/block/ataflop.c index 49f274197b16..432cf4018291 100644 --- a/drivers/block/ataflop.c +++ b/drivers/block/ataflop.c | |||
| @@ -1882,10 +1882,6 @@ static int __init atari_floppy_init (void) | |||
| 1882 | /* Amiga, Mac, ... don't have Atari-compatible floppy :-) */ | 1882 | /* Amiga, Mac, ... don't have Atari-compatible floppy :-) */ |
| 1883 | return -ENODEV; | 1883 | return -ENODEV; |
| 1884 | 1884 | ||
| 1885 | if (MACH_IS_HADES) | ||
| 1886 | /* Hades doesn't have Atari-compatible floppy */ | ||
| 1887 | return -ENODEV; | ||
| 1888 | |||
| 1889 | if (register_blkdev(FLOPPY_MAJOR,"fd")) | 1885 | if (register_blkdev(FLOPPY_MAJOR,"fd")) |
| 1890 | return -EBUSY; | 1886 | return -EBUSY; |
| 1891 | 1887 | ||