diff options
author | akpm@linux-foundation.org <akpm@linux-foundation.org> | 2008-04-29 13:47:54 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-29 14:00:39 -0400 |
commit | 97094dcf5cefc8ccfdf93839f54dac2c4d316165 (patch) | |
tree | 46d52394c925a78b37bdaa387af8f81cee7513b7 | |
parent | c9a3f6d6f541915bd7451fc7e9cb23a8b33a3ab8 (diff) |
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) { | |||
787 | major_dev = i; | 787 | major_dev = i; |
788 | 788 | ||
789 | #ifdef CONFIG_PROC_FS | 789 | #ifdef CONFIG_PROC_FS |
790 | proc_pccard = proc_mkdir("pccard", proc_bus); | 790 | proc_pccard = proc_mkdir("bus/pccard", NULL); |
791 | if (proc_pccard) | 791 | if (proc_pccard) |
792 | create_proc_read_entry("drivers",0,proc_pccard,proc_read_drivers,NULL); | 792 | create_proc_read_entry("drivers",0,proc_pccard,proc_read_drivers,NULL); |
793 | #endif | 793 | #endif |
@@ -798,7 +798,7 @@ void __exit pcmcia_cleanup_ioctl(void) { | |||
798 | #ifdef CONFIG_PROC_FS | 798 | #ifdef CONFIG_PROC_FS |
799 | if (proc_pccard) { | 799 | if (proc_pccard) { |
800 | remove_proc_entry("drivers", proc_pccard); | 800 | remove_proc_entry("drivers", proc_pccard); |
801 | remove_proc_entry("pccard", proc_bus); | 801 | remove_proc_entry("bus/pccard", NULL); |
802 | } | 802 | } |
803 | #endif | 803 | #endif |
804 | if (major_dev != -1) | 804 | if (major_dev != -1) |