forge/linux-uconsole
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity Actions
linux-uconsole/drivers/input/keyboard
History
黄涛 1bcabbad76 Revert "temp revert rk change" 
This reverts commit 15f7fabcb8.

Conflicts:

	.gitignore
	arch/arm/boot/compressed/head.S
	arch/arm/common/gic.c
	arch/arm/kernel/Makefile
	arch/arm/mm/proc-v7.S
	arch/arm/tools/mach-types
	arch/arm/vfp/vfphw.S
	drivers/Kconfig
	drivers/Makefile
	drivers/char/Makefile
	drivers/cpufreq/cpufreq_ondemand.c
	drivers/gpio/gpiolib.c
	drivers/gpio/tps65910-gpio.c
	drivers/input/Makefile
	drivers/input/keyboard/Kconfig
	drivers/input/keyboard/Makefile
	drivers/input/touchscreen/Kconfig
	drivers/media/video/Makefile
	drivers/media/video/ov2640.c
	drivers/media/video/soc_camera.c
	drivers/media/video/uvc/uvc_v4l2.c
	drivers/media/video/v4l2-ioctl.c
	drivers/mfd/Kconfig
	drivers/mfd/Makefile
	drivers/mfd/wm831x-core.c
	drivers/mfd/wm831x-i2c.c
	drivers/mfd/wm831x-irq.c
	drivers/mfd/wm831x-spi.c
	drivers/mfd/wm8994-core.c
	drivers/misc/Kconfig
	drivers/misc/Makefile
	drivers/misc/pmem.c
	drivers/mmc/card/block.c
	drivers/mmc/core/core.c
	drivers/mmc/core/mmc.c
	drivers/mmc/core/sd.c
	drivers/mmc/core/sdio.c
	drivers/mmc/host/Makefile
	drivers/net/wireless/Kconfig
	drivers/net/wireless/Makefile
	drivers/net/wireless/bcm4329/bcmsdh_linux.c
	drivers/net/wireless/bcm4329/dhd.h
	drivers/net/wireless/bcm4329/dhd_linux.c
	drivers/net/wireless/bcm4329/wl_iw.c
	drivers/net/wireless/bcm4329/wl_iw.h
	drivers/power/wm831x_power.c
	drivers/regulator/Makefile
	drivers/regulator/core.c
	drivers/regulator/tps65910-regulator.c
	drivers/regulator/wm831x-dcdc.c
	drivers/regulator/wm831x-isink.c
	drivers/regulator/wm831x-ldo.c
	drivers/rtc/Kconfig
	drivers/rtc/Makefile
	drivers/serial/Kconfig
	drivers/serial/Makefile
	drivers/staging/Kconfig
	drivers/staging/Makefile
	drivers/usb/Makefile
	drivers/usb/gadget/Kconfig
	drivers/usb/gadget/android.c
	drivers/usb/gadget/f_mass_storage.c
	drivers/usb/serial/option.c
	drivers/video/backlight/wm831x_bl.c
	fs/fat/dir.c
	fs/fat/fatent.c
	fs/fat/inode.c
	fs/yaffs2/yaffs_fs.c
	fs/yaffs2/yaffs_mtdif2.c
	include/linux/i2c.h
	include/linux/mfd/wm831x/core.h
	include/linux/mfd/wm831x/pdata.h
	include/linux/mfd/wm8994/core.h
	include/linux/mfd/wm8994/pdata.h
	include/linux/regulator/consumer.h
	include/media/v4l2-chip-ident.h
	kernel/power/earlysuspend.c
	kernel/power/wakelock.c
	kernel/sys.c
	mm/page_alloc.c
	sound/soc/codecs/Kconfig
	sound/soc/codecs/Makefile
	sound/soc/codecs/wm8900.c
	sound/soc/codecs/wm8988.c
	sound/soc/codecs/wm8994.c
	sound/soc/codecs/wm8994.h
	sound/soc/codecs/wm_hubs.c
	sound/soc/soc-cache.c
2011-11-04 17:43:18 +08:00
..
adp5520-keys.c
adp5588-keys.c Input: adp5588-keys - unify common header defines 2010-11-03 10:44:20 -07:00
adp5589-keys.c Input: ADP5589 - new driver for I2C Keypad Decoder and I/O Expander 2011-05-19 00:59:55 -07:00
amikbd.c
atakbd.c input/atari: Fix atarimouse init 2011-05-19 18:19:11 +02:00
atkbd.c Input: atkbd - add 'terminal' parameter for IBM Terminal keyboards 2010-11-04 10:30:48 -07:00
bf54x-keys.c
davinci_keyscan.c Fix common misspellings 2011-03-31 11:26:23 -03:00
ep93xx_keypad.c
gpio_keys.c Input: gpio-keys - add support for setting device name 2011-04-11 23:53:19 -07:00
gpio_keys_polled.c Input: add input driver for polled GPIO buttons 2010-12-06 17:15:15 -08:00
hil_kbd.c Input: hil_kbd - add missing MODULE_DEVICE_TABLE() 2010-10-13 07:49:05 -07:00
hilkbd.c
hpps2atkbd.h
imx_keypad.c
jornada680_kbd.c input: jornada680_kbd: ctrl_in/outX to __raw_read/writeX conversion. 2010-10-27 15:24:49 +09:00
jornada720_kbd.c
Kconfig Revert "temp revert rk change" 2011-11-04 17:43:18 +08:00
lkkbd.c
lm8323.c drivers: Final irq namespace conversion 2011-03-29 14:48:19 +02:00
locomokbd.c
Makefile Revert "temp revert rk change" 2011-11-04 17:43:18 +08:00
maple_keyb.c
matrix_keypad.c Merge remote-tracking branch 'remotes/tegra/android-tegra-2.6.36-honeycomb-mr1' into develop-2.6.36 2011-08-01 00:04:45 +08:00
max7359_keypad.c Input: max7359 - convert to dev_pm_ops 2011-02-21 01:02:30 -08:00
mcs_touchkey.c Input: mcs_touchkey - add shutdown handler 2011-02-23 21:43:38 -08:00
mpr121_touchkey.c Input: add driver FSL MPR121 capacitive touch sensor 2011-05-12 08:28:58 -07:00
newtonkbd.c
nomadik-ske-keypad.c Input: add support for Nomadik SKE keypad controller 2010-10-13 07:49:24 -07:00
omap-keypad.c Input: omap-keypad - add missing input_sync() 2011-06-18 02:54:42 -07:00
omap4-keypad.c Input: omap4-keypad - wire up runtime PM handling 2011-02-23 21:05:35 -08:00
opencores-kbd.c
pmic8xxx-keypad.c input: pmic8xxx-keypad: Do not use mfd_get_data() 2011-07-05 10:38:43 +02:00
pxa27x_keypad.c ARM: pxa27x_keypad: added wakeup event handler for keypad interrupts 2010-10-09 17:07:19 +08:00
pxa930_rotary.c
qt1070.c Input: qt1070 - add MODULE_DEVICE_TABLE 2011-04-27 23:11:13 -07:00
qt2160.c
rk29_keys.c add power off support for a22 2011-04-12 09:30:50 +08:00
rk29_newton_keys.c newton key early suspend 2011-09-01 10:27:41 +08:00
samsung-keypad.c
sh_keysc.c Input: sh_keysc - 8x8 MODE_6 fix 2011-06-18 02:55:01 -07:00
spear-keyboard.c Input: spear-keyboard - fix inverted condition in interrupt handler 2011-03-31 00:03:11 -07:00
stmpe-keypad.c input: Add STMPE keypad driver 2010-08-12 11:27:56 +02:00
stowaway.c
sunkbd.c
synaptics_so340010.c add board type: malata(mid) 2011-01-26 17:24:53 +08:00
tc3589x-keypad.c Input: tc3589x-keypad - fix 'double const' warning 2011-03-15 23:18:34 -07:00
tca6416-keypad.c Input: tca6416-keypad - suspend/resume wakeup support 2011-03-15 23:18:28 -07:00
tegra-kbc.c Input: tegra-kbc - change wakeup logic to be all or nothing 2011-05-11 14:31:09 -07:00
tnetv107x-keypad.c Input: tnetv107x-keypad - don't treat NULL clk as an error 2011-01-17 20:49:02 -08:00
twl4030_keypad.c Revert "Merge remote branch 'linux-2.6.32.y/master' into develop" 2011-07-30 16:24:52 +08:00
w90p910_keypad.c
wm831x_gpio_keys.c move wm831x code from rk2818 2011-02-26 14:30:08 +08:00
xtkbd.c