summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--arch/arm/kernel/isa.c2
-rw-r--r--include/linux/sysctl.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/kernel/isa.c b/arch/arm/kernel/isa.c
index c9b9526d22c4..685c3e591a7e 100644
--- a/arch/arm/kernel/isa.c
+++ b/arch/arm/kernel/isa.c
@@ -38,7 +38,7 @@ static ctl_table ctl_isa_vars[4] = {
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}};
diff --git a/include/linux/sysctl.h b/include/linux/sysctl.h
index da8115ec58f6..01f1208ca449 100644
--- a/include/linux/sysctl.h
+++ b/include/linux/sysctl.h
@@ -72,7 +72,7 @@ enum
/* CTL_BUS names: */
enum
{
- BUS_ISA=1 /* ISA */
+ CTL_BUS_ISA=1 /* ISA */
};
/* CTL_KERN names: */