Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 26 Jan 2011 06:31:44 +0000 (16:31 +1000)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 26 Jan 2011 06:31:44 +0000 (16:31 +1000)
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
  Input: wacom - pass touch resolution to clients through input_absinfo
  Input: wacom - add 2 Bamboo Pen and touch models
  Input: sysrq - ensure sysrq_enabled and __sysrq_enabled are consistent
  Input: sparse-keymap - fix KEY_VSW handling in sparse_keymap_setup
  Input: tegra-kbc - add tegra keyboard driver
  Input: gpio_keys - switch to using request_any_context_irq
  Input: serio - allow registered drivers to get status flag
  Input: ct82710c - return proper error code for ct82c710_open
  Input: bu21013_ts - added regulator support
  Input: bu21013_ts - remove duplicate resolution parameters
  Input: tnetv107x-ts - don't treat NULL clk as an error
  Input: tnetv107x-keypad - don't treat NULL clk as an error

Fix up trivial conflicts in drivers/input/keyboard/Makefile due to
additions of tc3589x/Tegra drivers

1  2 
drivers/input/keyboard/Kconfig
drivers/input/keyboard/Makefile
drivers/tty/sysrq.c
kernel/sysctl.c

@@@ -2,7 -2,7 +2,7 @@@
  # Input core configuration
  #
  menuconfig INPUT_KEYBOARD
 -      bool "Keyboards" if EMBEDDED || !X86
 +      bool "Keyboards" if EXPERT || !X86
        default y
        help
          Say Y here, and a list of supported keyboards will be displayed.
@@@ -57,7 -57,7 +57,7 @@@ config KEYBOARD_ATAR
          module will be called atakbd.
  
  config KEYBOARD_ATKBD
 -      tristate "AT keyboard" if EMBEDDED || !X86
 +      tristate "AT keyboard" if EXPERT || !X86
        default y
        select SERIO
        select SERIO_LIBPS2
@@@ -343,6 -343,16 +343,16 @@@ config KEYBOARD_NOMADI
          To compile this driver as a module, choose M here: the
          module will be called nmk-ske-keypad.
  
+ config KEYBOARD_TEGRA
+       tristate "NVIDIA Tegra internal matrix keyboard controller support"
+       depends on ARCH_TEGRA
+       help
+         Say Y here if you want to use a matrix keyboard connected directly
+         to the internal keyboard controller on Tegra SoCs.
+         To compile this driver as a module, choose M here: the
+         module will be called tegra-kbc.
  config KEYBOARD_OPENCORES
        tristate "OpenCores Keyboard Controller"
        help
@@@ -458,16 -468,6 +468,16 @@@ config KEYBOARD_SPEA
          To compile this driver as a module, choose M here: the
          module will be called spear-keboard.
  
 +config KEYBOARD_TC3589X
 +      tristate "TC3589X Keypad support"
 +      depends on MFD_TC3589X
 +      help
 +        Say Y here if you want to use the keypad controller on
 +        TC35892/3 I/O expander.
 +
 +        To compile this driver as a module, choose M here: the
 +        module will be called tc3589x-keypad.
 +
  config KEYBOARD_TNETV107X
        tristate "TI TNETV107X keypad support"
        depends on ARCH_DAVINCI_TNETV107X
@@@ -41,7 -41,7 +41,8 @@@ obj-$(CONFIG_KEYBOARD_SPEAR)          += spear-
  obj-$(CONFIG_KEYBOARD_STMPE)          += stmpe-keypad.o
  obj-$(CONFIG_KEYBOARD_STOWAWAY)               += stowaway.o
  obj-$(CONFIG_KEYBOARD_SUNKBD)         += sunkbd.o
 +obj-$(CONFIG_KEYBOARD_TC3589X)                += tc3589x-keypad.o
+ obj-$(CONFIG_KEYBOARD_TEGRA)          += tegra-kbc.o
  obj-$(CONFIG_KEYBOARD_TNETV107X)      += tnetv107x-keypad.o
  obj-$(CONFIG_KEYBOARD_TWL4030)                += twl4030_keypad.o
  obj-$(CONFIG_KEYBOARD_XTKBD)          += xtkbd.o
diff --combined drivers/tty/sysrq.c
@@@ -46,7 -46,7 +46,7 @@@
  #include <asm/irq_regs.h>
  
  /* Whether we react on sysrq keys or just ignore them */
- static int __read_mostly sysrq_enabled = 1;
+ static int __read_mostly sysrq_enabled = SYSRQ_DEFAULT_ENABLE;
  static bool __read_mostly sysrq_always_enabled;
  
  static bool sysrq_on(void)
diff --combined kernel/sysctl.c
@@@ -24,7 -24,6 +24,7 @@@
  #include <linux/slab.h>
  #include <linux/sysctl.h>
  #include <linux/signal.h>
 +#include <linux/printk.h>
  #include <linux/proc_fs.h>
  #include <linux/security.h>
  #include <linux/ctype.h>
@@@ -170,7 -169,8 +170,8 @@@ static int proc_taint(struct ctl_table 
  #endif
  
  #ifdef CONFIG_MAGIC_SYSRQ
- static int __sysrq_enabled; /* Note: sysrq code ises it's own private copy */
+ /* Note: sysrq code uses it's own private copy */
+ static int __sysrq_enabled = SYSRQ_DEFAULT_ENABLE;
  
  static int sysrq_sysctl_handler(ctl_table *table, int write,
                                void __user *buffer, size_t *lenp,
@@@ -246,6 -246,10 +247,6 @@@ static struct ctl_table root_table[] = 
                .mode           = 0555,
                .child          = dev_table,
        },
 -/*
 - * NOTE: do not add new entries to this table unless you have read
 - * Documentation/sysctl/ctl_unnumbered.txt
 - */
        { }
  };
  
@@@ -256,6 -260,8 +257,6 @@@ static int min_wakeup_granularity_ns
  static int max_wakeup_granularity_ns = NSEC_PER_SEC;  /* 1 second */
  static int min_sched_tunable_scaling = SCHED_TUNABLESCALING_NONE;
  static int max_sched_tunable_scaling = SCHED_TUNABLESCALING_END-1;
 -static int min_sched_shares_ratelimit = 100000; /* 100 usec */
 -static int max_sched_shares_ratelimit = NSEC_PER_SEC; /* 1 second */
  #endif
  
  #ifdef CONFIG_COMPACTION
@@@ -299,6 -305,15 +300,6 @@@ static struct ctl_table kern_table[] = 
                .extra1         = &min_wakeup_granularity_ns,
                .extra2         = &max_wakeup_granularity_ns,
        },
 -      {
 -              .procname       = "sched_shares_ratelimit",
 -              .data           = &sysctl_sched_shares_ratelimit,
 -              .maxlen         = sizeof(unsigned int),
 -              .mode           = 0644,
 -              .proc_handler   = sched_proc_update_handler,
 -              .extra1         = &min_sched_shares_ratelimit,
 -              .extra2         = &max_sched_shares_ratelimit,
 -      },
        {
                .procname       = "sched_tunable_scaling",
                .data           = &sysctl_sched_tunable_scaling,
                .extra1         = &min_sched_tunable_scaling,
                .extra2         = &max_sched_tunable_scaling,
        },
 -      {
 -              .procname       = "sched_shares_thresh",
 -              .data           = &sysctl_sched_shares_thresh,
 -              .maxlen         = sizeof(unsigned int),
 -              .mode           = 0644,
 -              .proc_handler   = proc_dointvec_minmax,
 -              .extra1         = &zero,
 -      },
        {
                .procname       = "sched_migration_cost",
                .data           = &sysctl_sched_migration_cost,
                .mode           = 0644,
                .proc_handler   = proc_dointvec,
        },
 +      {
 +              .procname       = "sched_shares_window",
 +              .data           = &sysctl_sched_shares_window,
 +              .maxlen         = sizeof(unsigned int),
 +              .mode           = 0644,
 +              .proc_handler   = proc_dointvec,
 +      },
        {
                .procname       = "timer_migration",
                .data           = &sysctl_timer_migration,
                .mode           = 0644,
                .proc_handler   = proc_dointvec,
        },
 +#ifdef CONFIG_SCHED_AUTOGROUP
 +      {
 +              .procname       = "sched_autogroup_enabled",
 +              .data           = &sysctl_sched_autogroup_enabled,
 +              .maxlen         = sizeof(unsigned int),
 +              .mode           = 0644,
 +              .proc_handler   = proc_dointvec,
 +              .extra1         = &zero,
 +              .extra2         = &one,
 +      },
 +#endif
  #ifdef CONFIG_PROVE_LOCKING
        {
                .procname       = "prove_locking",
                .extra1         = &zero,
                .extra2         = &ten_thousand,
        },
 +      {
 +              .procname       = "dmesg_restrict",
 +              .data           = &dmesg_restrict,
 +              .maxlen         = sizeof(int),
 +              .mode           = 0644,
 +              .proc_handler   = proc_dointvec_minmax,
 +              .extra1         = &zero,
 +              .extra2         = &one,
 +      },
 +      {
 +              .procname       = "kptr_restrict",
 +              .data           = &kptr_restrict,
 +              .maxlen         = sizeof(int),
 +              .mode           = 0644,
 +              .proc_handler   = proc_dointvec_minmax,
 +              .extra1         = &zero,
 +              .extra2         = &two,
 +      },
  #endif
        {
                .procname       = "ngroups_max",
                .extra1         = &zero,
                .extra2         = &one,
        },
 -#endif
 -#if defined(CONFIG_X86_LOCAL_APIC) && defined(CONFIG_X86) && !defined(CONFIG_LOCKUP_DETECTOR)
        {
 -              .procname       = "unknown_nmi_panic",
 -              .data           = &unknown_nmi_panic,
 +              .procname       = "nmi_watchdog",
 +              .data           = &watchdog_enabled,
                .maxlen         = sizeof (int),
                .mode           = 0644,
 -              .proc_handler   = proc_dointvec,
 +              .proc_handler   = proc_dowatchdog_enabled,
        },
 +#endif
 +#if defined(CONFIG_X86_LOCAL_APIC) && defined(CONFIG_X86)
        {
 -              .procname       = "nmi_watchdog",
 -              .data           = &nmi_watchdog_enabled,
 +              .procname       = "unknown_nmi_panic",
 +              .data           = &unknown_nmi_panic,
                .maxlen         = sizeof (int),
                .mode           = 0644,
 -              .proc_handler   = proc_nmi_enabled,
 +              .proc_handler   = proc_dointvec,
        },
  #endif
  #if defined(CONFIG_X86)
                .proc_handler   = proc_dointvec,
        },
  #endif
 -/*
 - * NOTE: do not add new entries to this table unless you have read
 - * Documentation/sysctl/ctl_unnumbered.txt
 - */
        { }
  };
  
@@@ -1328,6 -1319,11 +1329,6 @@@ static struct ctl_table vm_table[] = 
                .extra2         = &one,
        },
  #endif
 -
 -/*
 - * NOTE: do not add new entries to this table unless you have read
 - * Documentation/sysctl/ctl_unnumbered.txt
 - */
        { }
  };
  
@@@ -1483,6 -1479,10 +1484,6 @@@ static struct ctl_table fs_table[] = 
                .proc_handler   = &pipe_proc_fn,
                .extra1         = &pipe_min_size,
        },
 -/*
 - * NOTE: do not add new entries to this table unless you have read
 - * Documentation/sysctl/ctl_unnumbered.txt
 - */
        { }
  };
  
@@@ -2892,7 -2892,7 +2893,7 @@@ int proc_do_large_bitmap(struct ctl_tab
        }
  }
  
 -#else /* CONFIG_PROC_FS */
 +#else /* CONFIG_PROC_SYSCTL */
  
  int proc_dostring(struct ctl_table *table, int write,
                  void __user *buffer, size_t *lenp, loff_t *ppos)
@@@ -2944,7 -2944,7 +2945,7 @@@ int proc_doulongvec_ms_jiffies_minmax(s
  }
  
  
 -#endif /* CONFIG_PROC_FS */
 +#endif /* CONFIG_PROC_SYSCTL */
  
  /*
   * No sense putting this after each symbol definition, twice,