]> www.pilppa.org Git - linux-2.6-omap-h63xx.git/commitdiff
arm ide breakage
authorAl Viro <viro@ZenIV.linux.org.uk>
Sun, 26 Oct 2008 05:40:26 +0000 (05:40 +0000)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 26 Oct 2008 16:35:05 +0000 (09:35 -0700)
a) semicolon before the function body is a bad idea
b) it's const struct foo, not struct const foo
c) incidentally, it's ecard_remove_driver(), not ecard_unregister_driver()
d) compiling is occasionally useful.

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
drivers/ide/icside.c
drivers/ide/rapide.c

index 76bdc9a27f6f7ae91bbdd0ad4635fb169229a27c..2d848010499dfed1997e0f0eed459cb0cff847ec 100644 (file)
@@ -690,9 +690,9 @@ static int __init icside_init(void)
        return ecard_register_driver(&icside_driver);
 }
 
-static void __exit icside_exit(void);
+static void __exit icside_exit(void)
 {
-       ecard_unregister_driver(&icside_driver);
+       ecard_remove_driver(&icside_driver);
 }
 
 MODULE_AUTHOR("Russell King <rmk@arm.linux.org.uk>");
index 78d27d9ae4303ab6ee1dd4d2860445b80ea69a2d..d5003ca69801684bdc71e65db78767a41445c42e 100644 (file)
@@ -11,7 +11,7 @@
 
 #include <asm/ecard.h>
 
-static struct const ide_port_info rapide_port_info = {
+static const struct ide_port_info rapide_port_info = {
        .host_flags             = IDE_HFLAG_MMIO | IDE_HFLAG_NO_DMA,
 };
 
@@ -97,7 +97,7 @@ static int __init rapide_init(void)
 
 static void __exit rapide_exit(void)
 {
-       ecard_unregister_driver(&rapide_driver);
+       ecard_remove_driver(&rapide_driver);
 }
 
 MODULE_LICENSE("GPL");