diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-15 16:41:39 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-15 16:41:39 -0400 |
| commit | f2e1d89f9b349b3cd914b7c6ec6368632f4ad048 (patch) | |
| tree | 5b0042924a9f9c8b3309c0be880f51795916fc28 /arch | |
| parent | 85ffdd28be04c324349dfc7c9de3d4342c885c3f (diff) | |
| parent | 82ba56c273911f7eda79849cfa0fc2d2e5a3b75b (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (40 commits)
Input: use full RCU API
Input: remove tsdev interface
Input: add support for Blackfin BF54x Keypad controller
Input: appletouch - another fix for idle reset logic
HWMON: hdaps - switch to using input-polldev
Input: add support for SEGA Dreamcast keyboard
Input: omap-keyboard - don't pretend we support changing keymap
Input: lifebook - fix X and Y axis range
Input: usbtouchscreen - add support for GeneralTouch devices
Input: fix open count handling in input interfaces
Input: keyboard - add CapsShift lock
Input: adbhid - produce all CapsLock key events
Input: ALPS - add signature for ThinkPad R61
Input: jornada720_kbd - send MSC_SCAN events
Input: add support for the HP Jornada 7xx (710/720/728) touchscreen
Input: add support for HP Jornada 7xx onboard keyboard
Input: add support for HP Jornada onboard keyboard (HP6XX)
Input: ucb1400_ts - use schedule_timeout_uninterruptible
Input: xpad - fix dependancy on LEDS class
Input: auto-select INPUT for MAC_EMUMOUSEBTN option
...
Resolved conflicts manually in drivers/hwmon/applesmc.c: converting from
a class device to a device and converting to use input-polldev created a
few apparently trivial clashes..
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/blackfin/mach-bf548/boards/ezkit.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/blackfin/mach-bf548/boards/ezkit.c b/arch/blackfin/mach-bf548/boards/ezkit.c index 2c47db494f7d..046e6d84bbfc 100644 --- a/arch/blackfin/mach-bf548/boards/ezkit.c +++ b/arch/blackfin/mach-bf548/boards/ezkit.c | |||
| @@ -88,7 +88,7 @@ static struct platform_device bf54x_lq043_device = { | |||
| 88 | #endif | 88 | #endif |
| 89 | 89 | ||
| 90 | #if defined(CONFIG_KEYBOARD_BFIN) || defined(CONFIG_KEYBOARD_BFIN_MODULE) | 90 | #if defined(CONFIG_KEYBOARD_BFIN) || defined(CONFIG_KEYBOARD_BFIN_MODULE) |
| 91 | static int bf548_keymap[] = { | 91 | static const unsigned int bf548_keymap[] = { |
| 92 | KEYVAL(0, 0, KEY_ENTER), | 92 | KEYVAL(0, 0, KEY_ENTER), |
| 93 | KEYVAL(0, 1, KEY_HELP), | 93 | KEYVAL(0, 1, KEY_HELP), |
| 94 | KEYVAL(0, 2, KEY_0), | 94 | KEYVAL(0, 2, KEY_0), |
| @@ -110,8 +110,8 @@ static int bf548_keymap[] = { | |||
| 110 | static struct bfin_kpad_platform_data bf54x_kpad_data = { | 110 | static struct bfin_kpad_platform_data bf54x_kpad_data = { |
| 111 | .rows = 4, | 111 | .rows = 4, |
| 112 | .cols = 4, | 112 | .cols = 4, |
| 113 | .keymap = bf548_keymap, | 113 | .keymap = bf548_keymap, |
| 114 | .keymapsize = ARRAY_SIZE(bf548_keymap), | 114 | .keymapsize = ARRAY_SIZE(bf548_keymap), |
| 115 | .repeat = 0, | 115 | .repeat = 0, |
| 116 | .debounce_time = 5000, /* ns (5ms) */ | 116 | .debounce_time = 5000, /* ns (5ms) */ |
| 117 | .coldrive_time = 1000, /* ns (1ms) */ | 117 | .coldrive_time = 1000, /* ns (1ms) */ |