Merge git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/sysctl-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/sysctl-2.6: (43 commits)
  security/tomoyo: Remove now unnecessary handling of security_sysctl.
  security/tomoyo: Add a special case to handle accesses through the internal proc mount.
  sysctl: Drop & in front of every proc_handler.
  sysctl: Remove CTL_NONE and CTL_UNNUMBERED
  sysctl: kill dead ctl_handler definitions.
  sysctl: Remove the last of the generic binary sysctl support
  sysctl net: Remove unused binary sysctl code
  sysctl security/tomoyo: Don't look at ctl_name
  sysctl arm: Remove binary sysctl support
  sysctl x86: Remove dead binary sysctl support
  sysctl sh: Remove dead binary sysctl support
  sysctl powerpc: Remove dead binary sysctl support
  sysctl ia64: Remove dead binary sysctl support
  sysctl s390: Remove dead sysctl binary support
  sysctl frv: Remove dead binary sysctl support
  sysctl mips/lasat: Remove dead binary sysctl support
  sysctl drivers: Remove dead binary sysctl support
  sysctl crypto: Remove dead binary sysctl support
  sysctl security/keys: Remove dead binary sysctl support
  sysctl kernel: Remove binary sysctl logic
  ...

1 files changed, 4 insertions, 7 deletions

diff --git a/drivers/scsi/scsi_sysctl.c b/drivers/scsi/scsi_sysctl.c
index 63a30f566f3a..2b6b93f7d8ef 100644
--- a/drivers/scsi/scsi_sysctl.c
+++ b/drivers/scsi/scsi_sysctl.c
@@ -13,26 +13,23 @@
 
 
 static ctl_table scsi_table[] = {
-        { .ctl_name     = DEV_SCSI_LOGGING_LEVEL,
-          .procname     = "logging_level",
+        { .procname     = "logging_level",
           .data         = &scsi_logging_level,
           .maxlen       = sizeof(scsi_logging_level),
           .mode         = 0644,
-          .proc_handler = &proc_dointvec },
+          .proc_handler = proc_dointvec },
         { }
 };
 
 static ctl_table scsi_dir_table[] = {
-        { .ctl_name     = DEV_SCSI,
-          .procname     = "scsi",
+        { .procname     = "scsi",
           .mode         = 0555,
           .child        = scsi_table },
         { }
 };
 
 static ctl_table scsi_root_table[] = {
-        { .ctl_name     = CTL_DEV,
-          .procname     = "dev",
+        { .procname     = "dev",
           .mode         = 0555,
           .child        = scsi_dir_table },
         { }