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/Makefile | |
| 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/Makefile')
| -rw-r--r-- | drivers/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/Makefile b/drivers/Makefile index 380c2f1805..3aefc1221d 100644 --- a/drivers/Makefile +++ b/drivers/Makefile @@ -14,3 +14,4 @@ obj-y += mfd/ obj-$(CONFIG_LED) += led/ obj-y += eeprom/ obj-$(CONFIG_PWM) += pwm/ +obj-y += input/ |