atheros: revert to kernel 2.6.23

SVN-Revision: 11114

2 files changed, 23 insertions, 6 deletions

diff --git a/target/linux/atheros/Makefile b/target/linux/atheros/Makefile
index 6a88fc5a05..ab301ba509 100644
--- a/target/linux/atheros/Makefile
+++ b/target/linux/atheros/Makefile
@@ -9,9 +9,9 @@ include $(TOPDIR)/rules.mk
 ARCH:=mips
 BOARD:=atheros
 BOARDNAME:=Atheros 231x/5312
-FEATURES:=squashfs jffs2 pci usb
+FEATURES:=squashfs jffs2
 
-LINUX_VERSION:=2.6.25.1
+LINUX_VERSION:=2.6.23.16
 
 include $(INCLUDE_DIR)/target.mk
 
diff --git a/target/linux/atheros/config-2.6.23 b/target/linux/atheros/config-2.6.23
index 5d299d977e..1b83830146 100644
--- a/target/linux/atheros/config-2.6.23
+++ b/target/linux/atheros/config-2.6.23
@@ -8,8 +8,12 @@ CONFIG_AR2313=y
 CONFIG_ATHEROS=y
 CONFIG_ATHEROS_AR5312=y
 CONFIG_ATHEROS_AR5315=y
+CONFIG_ATHEROS_AR5315_PCI=y
 # CONFIG_ATM is not set
+# CONFIG_ATMEL is not set
 CONFIG_BASE_SMALL=0
+# CONFIG_BCM43XX is not set
+# CONFIG_BCM43XX_DMA_AND_PIO_MODE is not set
 CONFIG_BITREVERSE=y
 # CONFIG_BROADCOM_PHY is not set
 # CONFIG_BT is not set
@@ -43,6 +47,7 @@ CONFIG_CPU_SUPPORTS_HIGHMEM=y
 # CONFIG_CPU_TX39XX is not set
 # CONFIG_CPU_TX49XX is not set
 # CONFIG_CPU_VR41XX is not set
+CONFIG_DEVPORT=y
 # CONFIG_DM9000 is not set
 CONFIG_DMA_NEED_PCI_MAP_STATE=y
 CONFIG_DMA_NONCOHERENT=y
@@ -55,13 +60,16 @@ CONFIG_GPIO_DEVICE=y
 CONFIG_HAS_DMA=y
 CONFIG_HAS_IOMEM=y
 CONFIG_HAS_IOPORT=y
+# CONFIG_HERMES is not set
 # CONFIG_HOSTAP is not set
+CONFIG_HW_HAS_PCI=y
 CONFIG_HW_RANDOM=y
 # CONFIG_I2C is not set
 CONFIG_ICPLUS_PHY=y
 # CONFIG_IDE is not set
-# CONFIG_IEEE80211 is not set
 CONFIG_INITRAMFS_SOURCE=""
+# CONFIG_IPW2100 is not set
+# CONFIG_IPW2200 is not set
 CONFIG_IRQ_CPU=y
 # CONFIG_LEDS_ALIX is not set
 CONFIG_LEDS_GPIO=y
@@ -120,12 +128,14 @@ CONFIG_MTD_MAP_BANK_WIDTH_4=y
 # CONFIG_MTD_ONENAND is not set
 # CONFIG_MTD_OTP is not set
 CONFIG_MTD_PARTITIONS=y
+# CONFIG_MTD_PCI is not set
 # CONFIG_MTD_PHRAM is not set
 CONFIG_MTD_PHYSMAP=y
 CONFIG_MTD_PHYSMAP_BANKWIDTH=0
 CONFIG_MTD_PHYSMAP_LEN=0x0
 CONFIG_MTD_PHYSMAP_START=0x0
 # CONFIG_MTD_PLATRAM is not set
+# CONFIG_MTD_PMC551 is not set
 # CONFIG_MTD_RAM is not set
 CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-3
 CONFIG_MTD_REDBOOT_PARTS=y
@@ -134,17 +144,22 @@ CONFIG_MTD_REDBOOT_PARTS_READONLY=y
 # CONFIG_MTD_SLRAM is not set
 CONFIG_MTD_SPIFLASH=y
 CONFIG_MVSWITCH_PHY=y
+# CONFIG_NET_PCI is not set
+# CONFIG_NET_VENDOR_3COM is not set
 CONFIG_NEW_GPIO=y
 # CONFIG_NO_IOPORT is not set
 # CONFIG_PAGE_SIZE_16KB is not set
 CONFIG_PAGE_SIZE_4KB=y
 # CONFIG_PAGE_SIZE_64KB is not set
 # CONFIG_PAGE_SIZE_8KB is not set
+CONFIG_PCI=y
+# CONFIG_PCIPCWATCHDOG is not set
 CONFIG_PHYLIB=y
 # CONFIG_PMC_MSP is not set
 # CONFIG_PMC_YOSEMITE is not set
 # CONFIG_PNX8550_JBS is not set
 # CONFIG_PNX8550_STB810 is not set
+# CONFIG_PRISM54 is not set
 # CONFIG_QSEMI_PHY is not set
 # CONFIG_RTC is not set
 CONFIG_RWSEM_GENERIC_SPINLOCK=y
@@ -177,9 +192,11 @@ CONFIG_SYS_SUPPORTS_BIG_ENDIAN=y
 # CONFIG_TOSHIBA_RBTX4927 is not set
 # CONFIG_TOSHIBA_RBTX4938 is not set
 CONFIG_TRAD_SIGNALS=y
-# CONFIG_USB_ARCH_HAS_EHCI is not set
-# CONFIG_USB_ARCH_HAS_HCD is not set
-# CONFIG_USB_ARCH_HAS_OHCI is not set
+CONFIG_USB=m
+# CONFIG_USBPCWATCHDOG is not set
+# CONFIG_USB_EHCI_HCD is not set
+# CONFIG_USB_R8A66597_HCD is not set
+# CONFIG_USB_UHCI_HCD is not set
 # CONFIG_USER_NS is not set
 # CONFIG_VGASTATE is not set
 CONFIG_ZONE_DMA_FLAG=0