diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2012-02-17 10:19:25 +0100 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2012-02-17 10:19:25 +0100 |
commit | 4e0f084ea15d8797e77b54251eedbdd20c5ebd70 (patch) | |
tree | d8506bd91f9cdf09f64d1f008bc86a22f7d32d22 /drivers/Kconfig | |
parent | b1cf1685d3429e82459adceeed20873a4c088cfa (diff) | |
parent | 4f7b18e937ee3862e5b4b6ae0aea514b6caa0196 (diff) | |
download | barebox-4e0f084ea15d8797e77b54251eedbdd20c5ebd70.tar.gz barebox-4e0f084ea15d8797e77b54251eedbdd20c5ebd70.tar.xz |
Merge branch 'gpio_keys' of git://uboot.jcrosoft.org/barebox into next
Conflicts:
drivers/Makefile
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'drivers/Kconfig')
-rw-r--r-- | drivers/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/Kconfig b/drivers/Kconfig index 52eedd9946..c52c56a56a 100644 --- a/drivers/Kconfig +++ b/drivers/Kconfig @@ -14,6 +14,7 @@ source "drivers/clk/Kconfig" source "drivers/mfd/Kconfig" source "drivers/led/Kconfig" source "drivers/eeprom/Kconfig" +source "drivers/input/Kconfig" source "drivers/pwm/Kconfig" |