Merge branch 'keyboard' of git://github.com/hzhuang1/linux into next/drivers

Browse source

From Haojian Zhuang <haojian.zhuang@gmail.com>

* 'keyboard' of git://github.com/hzhuang1/linux:
  Input: pxa27x_keypad add choice to set direct_key_mask
  Input: pxa27x_keypad direct key may be low active
  Input: pxa27x_keypad bug fix for direct_key_mask
  Input: pxa27x_keypad keep clock on as wakeup source

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

...

This commit is contained in:

Arnd Bergmann 2012-04-30 23:57:55 +02:00

parent 66f75a5d02 fb054bf269

commit f7269a825c

2 changed files with 42 additions and 14 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

4

arch/arm/plat-pxa/include/plat/pxa27x_keypad.h

View file

52

drivers/input/keyboard/pxa27x_keypad.c

View file