kernel: fix some mistakes in ssb patch refresh in r22766, r22767 and r22768.

[openwrt.git] / target / linux / ar7 / config-2.6.32

diff --git a/target/linux/ar7/config-2.6.32 b/target/linux/ar7/config-2.6.32
index 4f0d145..208c0ba 100644 (file)
--- a/target/linux/ar7/config-2.6.32
+++ b/target/linux/ar7/config-2.6.32
@@ -1,5 +1,6 @@
 CONFIG_32BIT=y
 # CONFIG_64BIT is not set
 CONFIG_32BIT=y
 # CONFIG_64BIT is not set

+CONFIG_ADM6996_PHY=y

 # CONFIG_ALCHEMY_GPIO_INDIRECT is not set
 CONFIG_AR7=y
 CONFIG_AR7_GPIO=y
 # CONFIG_ALCHEMY_GPIO_INDIRECT is not set
 CONFIG_AR7=y
 CONFIG_AR7_GPIO=y


@@ -78,8 +79,8 @@ CONFIG_HAVE_IDE=y
 CONFIG_HAVE_OPROFILE=y
 CONFIG_HW_RANDOM=y
 CONFIG_INITRAMFS_SOURCE=""
 CONFIG_HAVE_OPROFILE=y
 CONFIG_HW_RANDOM=y
 CONFIG_INITRAMFS_SOURCE=""

+CONFIG_IP17XX_PHY=y

 CONFIG_IRQ_CPU=y
 CONFIG_IRQ_CPU=y

-# CONFIG_ISDN is not set

 CONFIG_KALLSYMS=y
 CONFIG_LEDS_GPIO=y
 # CONFIG_MACH_ALCHEMY is not set
 CONFIG_KALLSYMS=y
 CONFIG_LEDS_GPIO=y
 # CONFIG_MACH_ALCHEMY is not set


@@ -102,6 +103,7 @@ CONFIG_MIPS_MT_DISABLED=y
 CONFIG_MTD_AR7_PARTS=y
 CONFIG_MTD_CFI_STAA=y
 CONFIG_MTD_PHYSMAP=y
 CONFIG_MTD_AR7_PARTS=y
 CONFIG_MTD_CFI_STAA=y
 CONFIG_MTD_PHYSMAP=y

+CONFIG_MVSWITCH_PHY=y

 CONFIG_NO_EXCEPT_FILL=y
 # CONFIG_NO_IOPORT is not set
 # CONFIG_NXP_STB220 is not set
 CONFIG_NO_EXCEPT_FILL=y
 # CONFIG_NO_IOPORT is not set
 # CONFIG_NXP_STB220 is not set


@@ -112,7 +114,6 @@ CONFIG_PHYLIB=y
 # CONFIG_PMC_YOSEMITE is not set
 # CONFIG_PNX8550_JBS is not set
 # CONFIG_PNX8550_STB810 is not set
 # CONFIG_PMC_YOSEMITE is not set
 # CONFIG_PNX8550_JBS is not set
 # CONFIG_PNX8550_STB810 is not set

-# CONFIG_PROBE_INITRD_HEADER is not set

 CONFIG_SCHED_OMIT_FRAME_POINTER=y
 # CONFIG_SCSI_DMA is not set
 # CONFIG_SERIAL_8250_EXTENDED is not set
 CONFIG_SCHED_OMIT_FRAME_POINTER=y
 # CONFIG_SCSI_DMA is not set
 # CONFIG_SERIAL_8250_EXTENDED is not set


@@ -129,6 +130,7 @@ CONFIG_SCHED_OMIT_FRAME_POINTER=y
 # CONFIG_SIBYTE_SENTOSA is not set
 # CONFIG_SIBYTE_SWARM is not set
 CONFIG_SWAP_IO_SPACE=y
 # CONFIG_SIBYTE_SENTOSA is not set
 # CONFIG_SIBYTE_SWARM is not set
 CONFIG_SWAP_IO_SPACE=y

+CONFIG_SWCONFIG=y

 CONFIG_SYS_HAS_CPU_MIPS32_R1=y
 CONFIG_SYS_HAS_EARLY_PRINTK=y
 CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y
 CONFIG_SYS_HAS_CPU_MIPS32_R1=y
 CONFIG_SYS_HAS_EARLY_PRINTK=y
 CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y