git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
powerpc: convert CONFIG_PPC_MERGE to CONFIG_PPC for legacy io checks
[pandora-kernel.git]
/
drivers
/
block
/
floppy.c
diff --git
a/drivers/block/floppy.c
b/drivers/block/floppy.c
index
395f8ea
..
5813e0d
100644
(file)
--- a/
drivers/block/floppy.c
+++ b/
drivers/block/floppy.c
@@
-4165,7
+4165,7
@@
static int __init floppy_init(void)
int i, unit, drive;
int err, dr;
-#if defined(CONFIG_PPC
_MERGE
)
+#if defined(CONFIG_PPC)
if (check_legacy_ioport(FDC1))
return -ENODEV;
#endif