aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ar71xx/config-2.6.30
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2010-01-25 14:24:48 +0000
committerGabor Juhos <juhosg@openwrt.org>2010-01-25 14:24:48 +0000
commit20df2bf82545c258c0eac87ade5778143b750864 (patch)
tree87d6aee39c60d7aef530db98b7ea93e172346461 /target/linux/ar71xx/config-2.6.30
parentcae33bf4e92744490432350ae00ec50da0cc4980 (diff)
downloadupstream-20df2bf82545c258c0eac87ade5778143b750864.tar.gz
upstream-20df2bf82545c258c0eac87ade5778143b750864.tar.bz2
upstream-20df2bf82545c258c0eac87ade5778143b750864.zip
ar71xx: merge generic machine code into setup.c
SVN-Revision: 19325
Diffstat (limited to 'target/linux/ar71xx/config-2.6.30')
-rw-r--r--target/linux/ar71xx/config-2.6.305
1 files changed, 2 insertions, 3 deletions
diff --git a/target/linux/ar71xx/config-2.6.30 b/target/linux/ar71xx/config-2.6.30
index 878b6cd910..89146ecd11 100644
--- a/target/linux/ar71xx/config-2.6.30
+++ b/target/linux/ar71xx/config-2.6.30
@@ -19,7 +19,6 @@ CONFIG_AR71XX_MACH_AW_NR580=y
CONFIG_AR71XX_MACH_DIR_600_A1=y
CONFIG_AR71XX_MACH_DIR_615_C1=y
CONFIG_AR71XX_MACH_DIR_825_B1=y
-CONFIG_AR71XX_MACH_GENERIC=y
CONFIG_AR71XX_MACH_MZK_W04NU=y
CONFIG_AR71XX_MACH_MZK_W300NH=y
CONFIG_AR71XX_MACH_PB42=y
@@ -184,9 +183,9 @@ CONFIG_PHYLIB=y
# CONFIG_PNX8550_STB810 is not set
# CONFIG_PROBE_INITRD_HEADER is not set
CONFIG_RTL8306_PHY=y
-CONFIG_RTL8366_SMI=y
CONFIG_RTL8366S_PHY=y
-# CONFIG_RTL8366S_PHY_DEBUG_FS is not set
+CONFIG_RTL8366S_PHY_DEBUG_FS=y
+CONFIG_RTL8366_SMI=y
CONFIG_SCHED_OMIT_FRAME_POINTER=y
# CONFIG_SCSI_DMA is not set
# CONFIG_SERIAL_8250_EXTENDED is not set