From e6bb89f2a4364d121b60d27b0edf20561c300253 Mon Sep 17 00:00:00 2001 From: "akpm@linux-foundation.org" Date: Tue, 29 Apr 2008 10:47:54 -0700 Subject: [PATCH] --- yaml --- r: 94870 b: refs/heads/master c: 97094dcf5cefc8ccfdf93839f54dac2c4d316165 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/pcmcia/pcmcia_ioctl.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 4256c33ba8c0..2cbc4be70ce9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c9a3f6d6f541915bd7451fc7e9cb23a8b33a3ab8 +refs/heads/master: 97094dcf5cefc8ccfdf93839f54dac2c4d316165 diff --git a/trunk/drivers/pcmcia/pcmcia_ioctl.c b/trunk/drivers/pcmcia/pcmcia_ioctl.c index 27523c5f4dad..5f186abca108 100644 --- a/trunk/drivers/pcmcia/pcmcia_ioctl.c +++ b/trunk/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)