diff options
| author | Al Viro <viro@ZenIV.linux.org.uk> | 2008-10-26 05:40:26 +0000 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-26 09:35:05 -0700 |
| commit | 1137fb670465b6b5d15b9db7d01707a5833ee3ae (patch) | |
| tree | 84c46502d53718d0c9275e7d41ae6776ab9eab52 | |
| parent | ce97e13e52848c6388598696b7d44748598db759 (diff) | |
| download | linux-stable-1137fb670465b6b5d15b9db7d01707a5833ee3ae.tar.gz linux-stable-1137fb670465b6b5d15b9db7d01707a5833ee3ae.tar.bz2 linux-stable-1137fb670465b6b5d15b9db7d01707a5833ee3ae.zip | |
arm ide breakage
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>
| -rw-r--r-- | drivers/ide/icside.c | 4 | ||||
| -rw-r--r-- | drivers/ide/rapide.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/ide/icside.c b/drivers/ide/icside.c index 76bdc9a27f6f..2d848010499d 100644 --- a/drivers/ide/icside.c +++ b/drivers/ide/icside.c @@ -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>"); diff --git a/drivers/ide/rapide.c b/drivers/ide/rapide.c index 78d27d9ae430..d5003ca69801 100644 --- a/drivers/ide/rapide.c +++ b/drivers/ide/rapide.c @@ -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"); |