From: Florian Fainelli <florian@openwrt.org>
Date: Fri, 17 Apr 2009 10:29:19 +0000 (+0000)
Subject: merge r15235 to 8.09
X-Git-Tag: 8.09.1~112
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=9451084a20ff20934741ca53d4f6d71b14a12fd1;p=openwrt%2Fsvn-archive%2Fopenwrt.git

merge r15235 to 8.09

SVN-Revision: 15236
---

diff --git a/target/linux/au1000/config-2.6.25 b/target/linux/au1000/config-2.6.25
index f16f0948ab..e811569bce 100644
--- a/target/linux/au1000/config-2.6.25
+++ b/target/linux/au1000/config-2.6.25
@@ -94,8 +94,6 @@ CONFIG_I2C_CHARDEV=m
 # CONFIG_IBM_NEW_EMAC_ZMII is not set
 # CONFIG_IDE is not set
 CONFIG_INITRAMFS_SOURCE=""
-CONFIG_INPUT=y
-CONFIG_INPUT_KEYBOARD=y
 CONFIG_IRQ_CPU=y
 CONFIG_KEXEC=y
 # CONFIG_KEYBOARD_ATKBD is not set