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, 9 insertions, 11 deletions

diff --git a/drivers/cdrom/cdrom.c b/drivers/cdrom/cdrom.c
index 614da5b8613a..e3749d0ba68b 100644
--- a/drivers/cdrom/cdrom.c
+++ b/drivers/cdrom/cdrom.c
@@ -3557,67 +3557,65 @@ static ctl_table cdrom_table[] = {
                 .data           = &cdrom_sysctl_settings.info, 
                 .maxlen         = CDROM_STR_SIZE,
                 .mode           = 0444,
-                .proc_handler   = &cdrom_sysctl_info,
+                .proc_handler   = cdrom_sysctl_info,
         },
         {
                 .procname       = "autoclose",
                 .data           = &cdrom_sysctl_settings.autoclose,
                 .maxlen         = sizeof(int),
                 .mode           = 0644,
-                .proc_handler   = &cdrom_sysctl_handler,
+                .proc_handler   = cdrom_sysctl_handler,
         },
         {
                 .procname       = "autoeject",
                 .data           = &cdrom_sysctl_settings.autoeject,
                 .maxlen         = sizeof(int),
                 .mode           = 0644,
-                .proc_handler   = &cdrom_sysctl_handler,
+                .proc_handler   = cdrom_sysctl_handler,
         },
         {
                 .procname       = "debug",
                 .data           = &cdrom_sysctl_settings.debug,
                 .maxlen         = sizeof(int),
                 .mode           = 0644,
-                .proc_handler   = &cdrom_sysctl_handler,
+                .proc_handler   = cdrom_sysctl_handler,
         },
         {
                 .procname       = "lock",
                 .data           = &cdrom_sysctl_settings.lock,
                 .maxlen         = sizeof(int),
                 .mode           = 0644,
-                .proc_handler   = &cdrom_sysctl_handler,
+                .proc_handler   = cdrom_sysctl_handler,
         },
         {
                 .procname       = "check_media",
                 .data           = &cdrom_sysctl_settings.check,
                 .maxlen         = sizeof(int),
                 .mode           = 0644,
-                .proc_handler   = &cdrom_sysctl_handler
+                .proc_handler   = cdrom_sysctl_handler
         },
-        { .ctl_name = 0 }
+        { }
 };
 
 static ctl_table cdrom_cdrom_table[] = {
         {
-                .ctl_name       = DEV_CDROM,
                 .procname       = "cdrom",
                 .maxlen         = 0,
                 .mode           = 0555,
                 .child          = cdrom_table,
         },
-        { .ctl_name = 0 }
+        { }
 };
 
 /* Make sure that /proc/sys/dev is there */
 static ctl_table cdrom_root_table[] = {
         {
-                .ctl_name       = CTL_DEV,
                 .procname       = "dev",
                 .maxlen         = 0,
                 .mode           = 0555,
                 .child          = cdrom_cdrom_table,
         },
-        { .ctl_name = 0 }
+        { }
 };
 static struct ctl_table_header *cdrom_sysctl_header;