On Tue, 29 Apr 2008 21:27:10 +0300
Adrian Bunk <[EMAIL PROTECTED]> wrote:
> Commit 9c37066d888bf6e1b96ad12304971b3ddeabbad0 (proc: remove proc_bus)
> came through -mm that contains a patch implementing the overdue removal
> of the PCMCIA control ioctl that did not yet make it into Linus' tree:
>
> <--- snip -->
>
> ...
> CC drivers/pcmcia/pcmcia_ioctl.o
> /home/bunk/linux/kernel-2.6/git/linux-2.6/drivers/pcmcia/pcmcia_ioctl.c: In
> function ___pcmcia_setup_ioctl___:
> /home/bunk/linux/kernel-2.6/git/linux-2.6/drivers/pcmcia/pcmcia_ioctl.c:790:
> error: ___proc_bus___ undeclared (first use in this function)
> /home/bunk/linux/kernel-2.6/git/linux-2.6/drivers/pcmcia/pcmcia_ioctl.c:790:
> error: (Each undeclared identifier is reported only once
> /home/bunk/linux/kernel-2.6/git/linux-2.6/drivers/pcmcia/pcmcia_ioctl.c:790:
> error: for each function it appears in.)
> /home/bunk/linux/kernel-2.6/git/linux-2.6/drivers/pcmcia/pcmcia_ioctl.c: In
> function ___pcmcia_cleanup_ioctl___:
> /home/bunk/linux/kernel-2.6/git/linux-2.6/drivers/pcmcia/pcmcia_ioctl.c:801:
> error: ___proc_bus___ undeclared (first use in this function)
> make[3]: *** [drivers/pcmcia/pcmcia_ioctl.o] Error 1
>
> <-- snip -->
>
Yes, I fixed it but then fumbled the fix :(
I sent Linus the below an hour or so ago.
--- a/drivers/pcmcia/pcmcia_ioctl.c~drivers-pcmcia-pcmcia_ioctlc-fix-build
+++ a/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)
_
_______________________________________________
Linux PCMCIA reimplementation list
http://lists.infradead.org/mailman/listinfo/linux-pcmcia
