Messages in this thread Patch in this message | | | Date | Wed, 5 Nov 2003 21:23:47 +1100 | Subject | [SYSCTL] BUS_ISA -> CTL_BUS_ISA | From | Herbert Xu <> |
| |
Hi:
This is a patch from Greg KH which fixes the name conflict between sysctl.h and input.h on BUS_ISA. It's been part of 2.5 for more than a year.
Thanks, -- Debian GNU/Linux 3.0 is out! ( http://www.debian.org/ ) Email: Herbert Xu ~{PmV>HI~} <herbert@gondor.apana.org.au> Home Page: http://gondor.apana.org.au/~herbert/ PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt Index: kernel-source-2.4/include/linux/sysctl.h =================================================================== RCS file: /home/gondolin/herbert/src/CVS/debian/kernel-source-2.4/include/linux/sysctl.h,v retrieving revision 1.6 diff -u -r1.6 sysctl.h --- kernel-source-2.4/include/linux/sysctl.h 3 Sep 2003 10:27:20 -0000 1.6 +++ kernel-source-2.4/include/linux/sysctl.h 5 Nov 2003 10:20:34 -0000 @@ -69,7 +69,7 @@ /* CTL_BUS names: */ enum { - BUS_ISA=1 /* ISA */ + CTL_BUS_ISA=1 /* ISA */ }; /* CTL_KERN names: */ Index: kernel-source-2.4/arch/arm/kernel/isa.c =================================================================== RCS file: /home/gondolin/herbert/src/CVS/debian/kernel-source-2.4/arch/arm/kernel/isa.c,v retrieving revision 1.1.1.3 diff -u -r1.1.1.3 isa.c --- kernel-source-2.4/arch/arm/kernel/isa.c 18 Sep 2000 22:15:25 -0000 1.1.1.3 +++ kernel-source-2.4/arch/arm/kernel/isa.c 5 Nov 2003 10:20:25 -0000 @@ -38,7 +38,7 @@ static struct ctl_table_header *isa_sysctl_header; -static ctl_table ctl_isa[2] = {{BUS_ISA, "isa", NULL, 0, 0555, ctl_isa_vars}, +static ctl_table ctl_isa[2] = {{CTL_BUS_ISA, "isa", NULL, 0, 0555, ctl_isa_vars}, {0}}; static ctl_table ctl_bus[2] = {{CTL_BUS, "bus", NULL, 0, 0555, ctl_isa}, {0}}; | |