From: Peter Denison <openwrt@marshadder.org>
Date: Tue, 20 May 2008 21:38:04 +0000 (+0000)
Subject: Revert last 3 commits made in error. Proper versions will come later
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=7cf7b7a1a89d023f3c4a063864074d0aa59a7ecc;p=openwrt%2Fstaging%2Fnbd.git

Revert last 3 commits made in error. Proper versions will come later

SVN-Revision: 11229
---

diff --git a/target/linux/brcm47xx/Makefile b/target/linux/brcm47xx/Makefile
index da8578effb..24f13af0a1 100644
--- a/target/linux/brcm47xx/Makefile
+++ b/target/linux/brcm47xx/Makefile
@@ -11,7 +11,7 @@ BOARD:=brcm47xx
 BOARDNAME:=Broadcom BCM947xx/953xx
 FEATURES:=squashfs usb
 
-LINUX_VERSION:=2.6.25.1
+LINUX_VERSION:=2.6.23.17
 
 include $(INCLUDE_DIR)/target.mk
 DEFAULT_PACKAGES += kmod-switch kmod-diag
diff --git a/target/linux/brcm47xx/config-2.6.25 b/target/linux/brcm47xx/config-2.6.25
index 054f8a3b74..3ca3f7116b 100644
--- a/target/linux/brcm47xx/config-2.6.25
+++ b/target/linux/brcm47xx/config-2.6.25
@@ -89,7 +89,6 @@ CONFIG_INPUT_POLLDEV=y
 # CONFIG_IP6_NF_MATCH_OPTS is not set
 # CONFIG_IP6_NF_MATCH_RT is not set
 # CONFIG_IP6_NF_TARGET_HL is not set
-# CONFIG_IP6_NF_TARGET_IMQ is not set
 CONFIG_IPW2200_QOS=y
 # CONFIG_IP_ROUTE_VERBOSE is not set
 CONFIG_IRQ_CPU=y
@@ -168,7 +167,6 @@ CONFIG_NETDEV_1000=y
 CONFIG_PAGE_SIZE_4KB=y
 # CONFIG_PAGE_SIZE_64KB is not set
 # CONFIG_PAGE_SIZE_8KB is not set
-CONFIG_PCI=y
 # CONFIG_PMC_MSP is not set
 # CONFIG_PMC_YOSEMITE is not set
 # CONFIG_PNX8550_JBS is not set
diff --git a/target/linux/generic-2.6/config-2.6.25 b/target/linux/generic-2.6/config-2.6.25
index f9b8523e58..5f3bc76400 100644
--- a/target/linux/generic-2.6/config-2.6.25
+++ b/target/linux/generic-2.6/config-2.6.25
@@ -544,7 +544,7 @@ CONFIG_IP6_NF_MATCH_RT=m
 CONFIG_IP6_NF_QUEUE=m
 CONFIG_IP6_NF_RAW=m
 CONFIG_IP6_NF_TARGET_HL=m
-# CONFIG_IP6_NF_TARGET_IMQ is not set
+CONFIG_IP6_NF_TARGET_IMQ=m
 CONFIG_IP6_NF_TARGET_LOG=m
 CONFIG_IP6_NF_TARGET_REJECT=m
 CONFIG_IP6_NF_TARGET_ROUTE=m
@@ -634,7 +634,7 @@ CONFIG_IP_NF_SET_PORTMAP=m
 CONFIG_IP_NF_SIP=m
 # CONFIG_IP_NF_TARGET_CLUSTERIP is not set
 CONFIG_IP_NF_TARGET_ECN=m
-# CONFIG_IP_NF_TARGET_IMQ is not set
+CONFIG_IP_NF_TARGET_IMQ=m
 CONFIG_IP_NF_TARGET_LOG=m
 CONFIG_IP_NF_TARGET_MASQUERADE=y
 CONFIG_IP_NF_TARGET_NETMAP=m
@@ -1632,7 +1632,6 @@ CONFIG_USB_PEGASUS=m
 # CONFIG_USB_POWERMATE is not set
 CONFIG_USB_PRINTER=m
 # CONFIG_USB_QUICKCAM_MESSENGER is not set
-# CONFIG_R8A66597_HCD is not set
 # CONFIG_USB_RIO500 is not set
 # CONFIG_USB_RTL8150 is not set
 # CONFIG_USB_SE401 is not set