Commit c59ccd5f authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman

LSM: change BUS_ISA to CTL_BUS_ISA to prevent namespace collision with the input subsystem.

This is needed due to the next header file changes.
parent 047cef32
......@@ -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}};
......
......@@ -72,7 +72,7 @@ enum
/* CTL_BUS names: */
enum
{
BUS_ISA=1 /* ISA */
CTL_BUS_ISA=1 /* ISA */
};
/* CTL_KERN names: */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment