summaryrefslogtreecommitdiff
path: root/packages/linux
diff options
context:
space:
mode:
authorOvidiu Sas <sip.nslu@gmail.com>2008-01-16 15:29:38 +0000
committerOvidiu Sas <sip.nslu@gmail.com>2008-01-16 15:29:38 +0000
commitedfc1860782c39f6507cf68bc63620bf9e0f18f8 (patch)
tree335c77c782a90ef41411314efc4b2a2788b04f34 /packages/linux
parent3cb1f292aa4ddce72f970ef4181ee7057cf3b573 (diff)
parenta2545abb038db58e661f28328cff70d901d4be59 (diff)
merge of '16c96161b634d2e64b9a1b4ba0e3fff5ddf21bcb'
and 'c32d254617ffcc037ac8e1b813c7d23979d2cb1c'
Diffstat (limited to 'packages/linux')
-rw-r--r--packages/linux/linux-tornado-omap2/htctornado/defconfig5
1 files changed, 4 insertions, 1 deletions
diff --git a/packages/linux/linux-tornado-omap2/htctornado/defconfig b/packages/linux/linux-tornado-omap2/htctornado/defconfig
index 9be1116739..ec67393992 100644
--- a/packages/linux/linux-tornado-omap2/htctornado/defconfig
+++ b/packages/linux/linux-tornado-omap2/htctornado/defconfig
@@ -259,7 +259,10 @@ CONFIG_INET=y
# CONFIG_IP_MULTICAST is not set
# CONFIG_IP_ADVANCED_ROUTER is not set
CONFIG_IP_FIB_HASH=y
-# CONFIG_IP_PNP is not set
+CONFIG_IP_PNP=y
+# CONFIG_IP_PNP_DHCP is not set
+# CONFIG_IP_PNP_BOOTP is not set
+# CONFIG_IP_PNP_RARP is not set
# CONFIG_NET_IPIP is not set
# CONFIG_NET_IPGRE is not set
# CONFIG_ARPD is not set