diff options
| author | Peter Denison <openwrt@marshadder.org> | 2008-05-20 21:38:04 +0000 |
|---|---|---|
| committer | Peter Denison <openwrt@marshadder.org> | 2008-05-20 21:38:04 +0000 |
| commit | 6755af36b6729be79bcb0f688ebde4b625145d27 (patch) | |
| tree | e797c2553852080b00a8946974a7ed63707b722d /target | |
| parent | 785772a3eb5558d9c3f0843e85ed3cdda5777a56 (diff) | |
| download | master-187ad058-6755af36b6729be79bcb0f688ebde4b625145d27.tar.gz master-187ad058-6755af36b6729be79bcb0f688ebde4b625145d27.tar.bz2 master-187ad058-6755af36b6729be79bcb0f688ebde4b625145d27.zip | |
Revert last 3 commits made in error. Proper versions will come later
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@11229 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target')
| -rw-r--r-- | target/linux/brcm47xx/Makefile | 2 | ||||
| -rw-r--r-- | target/linux/brcm47xx/config-2.6.25 | 2 | ||||
| -rw-r--r-- | target/linux/generic-2.6/config-2.6.25 | 5 |
3 files changed, 3 insertions, 6 deletions
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 |