diff options
| author | akpm@linux-foundation.org <akpm@linux-foundation.org> | 2008-04-29 19:47:54 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-29 20:00:39 +0200 |
| commit | 97094dcf5cefc8ccfdf93839f54dac2c4d316165 (patch) | |
| tree | 46d52394c925a78b37bdaa387af8f81cee7513b7 | |
| parent | dm: use unlocked variants of queue flag check/set (diff) | |
| download | linux-97094dcf5cefc8ccfdf93839f54dac2c4d316165.tar.xz linux-97094dcf5cefc8ccfdf93839f54dac2c4d316165.zip | |
drivers/pcmcia/pcmcia_ioctl.c: fix build
argh. A hunk got lost from "proc: remove proc_bus"
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
| -rw-r--r-- | drivers/pcmcia/pcmcia_ioctl.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/pcmcia/pcmcia_ioctl.c b/drivers/pcmcia/pcmcia_ioctl.c index 27523c5f4dad..5f186abca108 100644 --- a/drivers/pcmcia/pcmcia_ioctl.c +++ b/drivers/pcmcia/pcmcia_ioctl.c @@ -787,7 +787,7 @@ void __init pcmcia_setup_ioctl(void) { major_dev = i; #ifdef CONFIG_PROC_FS - proc_pccard = proc_mkdir("pccard", proc_bus); + proc_pccard = proc_mkdir("bus/pccard", NULL); if (proc_pccard) create_proc_read_entry("drivers",0,proc_pccard,proc_read_drivers,NULL); #endif @@ -798,7 +798,7 @@ void __exit pcmcia_cleanup_ioctl(void) { #ifdef CONFIG_PROC_FS if (proc_pccard) { remove_proc_entry("drivers", proc_pccard); - remove_proc_entry("pccard", proc_bus); + remove_proc_entry("bus/pccard", NULL); } #endif if (major_dev != -1) |