]> err.no Git - linux-2.6/commitdiff
drivers/pcmcia/pcmcia_ioctl.c: fix build
authorakpm@linux-foundation.org <akpm@linux-foundation.org>
Tue, 29 Apr 2008 17:47:54 +0000 (10:47 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 29 Apr 2008 18:00:39 +0000 (11:00 -0700)
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>
drivers/pcmcia/pcmcia_ioctl.c

index 27523c5f4dad50a9fd9de15ff768257945716d99..5f186abca1082843a7b12e30865b3bb7c8b83f34 100644 (file)
@@ -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)