author | Linus Torvalds <torvalds@linux-foundation.org> | |
Mon, 25 Oct 2010 17:59:31 +0000 (10:59 -0700) | ||
committer | Linus Torvalds <torvalds@linux-foundation.org> | |
Mon, 25 Oct 2010 17:59:31 +0000 (10:59 -0700) |
* 'davinci-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-davinci: (50 commits)
davinci: fix remaining board support after io_pgoffst removal
davinci: mityomapl138: make file local data static
arm/davinci: remove duplicated include
davinci: Initial support for Omapl138-Hawkboard
davinci: MityDSP-L138/MityARM-1808 read MAC address from I2C Prom
davinci: add tnetv107x touchscreen platform device
input: add driver for tnetv107x touchscreen controller
davinci: add keypad config for tnetv107x evm board
davinci: add tnetv107x keypad platform device
input: add driver for tnetv107x on-chip keypad controller
net: davinci_emac: cleanup unused cpdma code
net: davinci_emac: switch to new cpdma layer
net: davinci_emac: separate out cpdma code
net: davinci_emac: cleanup unused mdio emac code
omap: cleanup unused davinci mdio arch code
davinci: cleanup mdio arch code and switch to phy_id
net: davinci_emac: switch to new mdio
omap: add mdio platform devices
davinci: add mdio platform devices
net: davinci_emac: separate out davinci mdio
...
Fix up trivial conflict in drivers/input/keyboard/Kconfig (two entries
added next to each other - one from the davinci merge, one from the
input merge)
davinci: fix remaining board support after io_pgoffst removal
davinci: mityomapl138: make file local data static
arm/davinci: remove duplicated include
davinci: Initial support for Omapl138-Hawkboard
davinci: MityDSP-L138/MityARM-1808 read MAC address from I2C Prom
davinci: add tnetv107x touchscreen platform device
input: add driver for tnetv107x touchscreen controller
davinci: add keypad config for tnetv107x evm board
davinci: add tnetv107x keypad platform device
input: add driver for tnetv107x on-chip keypad controller
net: davinci_emac: cleanup unused cpdma code
net: davinci_emac: switch to new cpdma layer
net: davinci_emac: separate out cpdma code
net: davinci_emac: cleanup unused mdio emac code
omap: cleanup unused davinci mdio arch code
davinci: cleanup mdio arch code and switch to phy_id
net: davinci_emac: switch to new mdio
omap: add mdio platform devices
davinci: add mdio platform devices
net: davinci_emac: separate out davinci mdio
...
Fix up trivial conflict in drivers/input/keyboard/Kconfig (two entries
added next to each other - one from the davinci merge, one from the
input merge)
1 | 2 | |||
---|---|---|---|---|
MAINTAINERS | patch | | diff1 | | diff2 | | blob | history |
arch/arm/mach-davinci/devices.c | patch | | diff1 | | diff2 | | blob | history |
arch/arm/mach-omap2/board-am3517evm.c | patch | | diff1 | | diff2 | | blob | history |
drivers/input/keyboard/Kconfig | patch | | diff1 | | diff2 | | blob | history |
drivers/input/keyboard/Makefile | patch | | diff1 | | diff2 | | blob | history |
drivers/input/touchscreen/Kconfig | patch | | diff1 | | diff2 | | blob | history |
drivers/input/touchscreen/Makefile | patch | | diff1 | | diff2 | | blob | history |
drivers/net/Kconfig | patch | | diff1 | | diff2 | | blob | history |
drivers/net/Makefile | patch | | diff1 | | diff2 | | blob | history |
diff --cc MAINTAINERS
Simple merge
diff --cc arch/arm/mach-davinci/devices.c
Simple merge
diff --cc arch/arm/mach-omap2/board-am3517evm.c
Simple merge
diff --cc drivers/input/keyboard/Kconfig
index 0426630f0e981089530493862ebdc2ee9efe385d,48cf9ec8baf2d1e27111883612c0c7334ef52281..b8c51b9781dbfb5e51c9a9d84071f534bf44e1d1
To compile this driver as a module, choose M here: the
module will be called omap-keypad.
+config KEYBOARD_OMAP4
+ tristate "TI OMAP4 keypad support"
+ depends on ARCH_OMAP4
+ help
+ Say Y here if you want to use the OMAP4 keypad.
+
+ To compile this driver as a module, choose M here: the
+ module will be called omap4-keypad.
+
+ config KEYBOARD_TNETV107X
+ tristate "TI TNETV107X keypad support"
+ depends on ARCH_DAVINCI_TNETV107X
+ help
+ Say Y here if you want to use the TNETV107X keypad.
+
+ To compile this driver as a module, choose M here: the
+ module will be called tnetv107x-keypad.
+
config KEYBOARD_TWL4030
tristate "TI TWL4030/TWL5030/TPS659x0 keypad support"
depends on TWL4030_CORE
diff --cc drivers/input/keyboard/Makefile
Simple merge
diff --cc drivers/input/touchscreen/Kconfig
Simple merge
diff --cc drivers/input/touchscreen/Makefile
Simple merge
diff --cc drivers/net/Kconfig
Simple merge
diff --cc drivers/net/Makefile
Simple merge