brcm47xx: fix a small copy&paste error in the b44 fix for 2.6.34 and 2.6.35

[openwrt.git] / target / linux / rdc / config-2.6.30

diff --git a/target/linux/rdc/config-2.6.30 b/target/linux/rdc/config-2.6.30
index 6678ef5..1e0c942 100644 (file)
--- a/target/linux/rdc/config-2.6.30
+++ b/target/linux/rdc/config-2.6.30
@@ -3,7 +3,6 @@
 # CONFIG_64BIT is not set
 # CONFIG_ACQUIRE_WDT is not set
 # CONFIG_ADVANTECH_WDT is not set
 # CONFIG_64BIT is not set
 # CONFIG_ACQUIRE_WDT is not set
 # CONFIG_ADVANTECH_WDT is not set

-# CONFIG_AGP is not set

 # CONFIG_ALIM1535_WDT is not set
 CONFIG_ARCH_DEFCONFIG="arch/x86/configs/i386_defconfig"
 CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y
 # CONFIG_ALIM1535_WDT is not set
 CONFIG_ARCH_DEFCONFIG="arch/x86/configs/i386_defconfig"
 CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y


@@ -14,6 +13,7 @@ CONFIG_ARCH_HIBERNATION_POSSIBLE=y
 CONFIG_ARCH_MAY_HAVE_PC_FDC=y
 # CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set
 CONFIG_ARCH_POPULATES_NODE_MAP=y
 CONFIG_ARCH_MAY_HAVE_PC_FDC=y
 # CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set
 CONFIG_ARCH_POPULATES_NODE_MAP=y

+CONFIG_ARCH_REQUIRE_GPIOLIB=y

 CONFIG_ARCH_SELECT_MEMORY_MODEL=y
 CONFIG_ARCH_SPARSEMEM_ENABLE=y
 CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
 CONFIG_ARCH_SELECT_MEMORY_MODEL=y
 CONFIG_ARCH_SPARSEMEM_ENABLE=y
 CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y


@@ -22,11 +22,13 @@ CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING=y
 CONFIG_ARCH_SUSPEND_POSSIBLE=y
 CONFIG_ARCH_WANT_FRAME_POINTERS=y
 CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
 CONFIG_ARCH_SUSPEND_POSSIBLE=y
 CONFIG_ARCH_WANT_FRAME_POINTERS=y
 CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y

+# CONFIG_ARPD is not set

 # CONFIG_AUDIT_ARCH is not set
 # CONFIG_BASE_FULL is not set
 CONFIG_BASE_SMALL=1
 # CONFIG_BINARY_PRINTF is not set
 CONFIG_BITREVERSE=y
 # CONFIG_AUDIT_ARCH is not set
 # CONFIG_BASE_FULL is not set
 CONFIG_BASE_SMALL=1
 # CONFIG_BINARY_PRINTF is not set
 CONFIG_BITREVERSE=y

+# CONFIG_BLK_DEV_INITRD is not set

 CONFIG_BLK_DEV_RAM=y
 CONFIG_BLK_DEV_RAM_COUNT=16
 CONFIG_BLK_DEV_RAM_SIZE=4096
 CONFIG_BLK_DEV_RAM=y
 CONFIG_BLK_DEV_RAM_COUNT=16
 CONFIG_BLK_DEV_RAM_SIZE=4096


@@ -34,45 +36,34 @@ CONFIG_BOUNCE=y
 CONFIG_CC_OPTIMIZE_FOR_SIZE=y
 # CONFIG_CC_STACKPROTECTOR is not set
 CONFIG_CLOCKSOURCE_WATCHDOG=y
 CONFIG_CC_OPTIMIZE_FOR_SIZE=y
 # CONFIG_CC_STACKPROTECTOR is not set
 CONFIG_CLOCKSOURCE_WATCHDOG=y

-CONFIG_CMDLINE="console=ttyS0,38400"
+CONFIG_CMDLINE="console=ttyS0,38400 rootfstype=squashfs,jffs2"

 CONFIG_CMDLINE_BOOL=y
 # CONFIG_CMDLINE_OVERRIDE is not set
 CONFIG_CMDLINE_BOOL=y
 # CONFIG_CMDLINE_OVERRIDE is not set

+# CONFIG_COMPAT_NET_DEV_OPS is not set

 # CONFIG_COMPAT_VDSO is not set
 # CONFIG_CPU5_WDT is not set
 # CONFIG_COMPAT_VDSO is not set
 # CONFIG_CPU5_WDT is not set

-# CONFIG_CPU_FREQ is not set
-CONFIG_CPU_SUP_AMD=y
-CONFIG_CPU_SUP_CENTAUR=y
-CONFIG_CPU_SUP_CYRIX_32=y
-CONFIG_CPU_SUP_INTEL=y
-CONFIG_CPU_SUP_TRANSMETA_32=y
-CONFIG_CPU_SUP_UMC_32=y
-CONFIG_CRYPTO_AEAD2=y
-CONFIG_CRYPTO_BLKCIPHER2=y
-CONFIG_CRYPTO_HASH2=y
-CONFIG_CRYPTO_MANAGER2=y
-CONFIG_CRYPTO_RNG2=y
-CONFIG_CRYPTO_WORKQUEUE=y
+# CONFIG_CPU_SUP_AMD is not set
+# CONFIG_CPU_SUP_CENTAUR is not set
+# CONFIG_CPU_SUP_CYRIX_32 is not set
+# CONFIG_CPU_SUP_INTEL is not set
+# CONFIG_CPU_SUP_TRANSMETA_32 is not set
+# CONFIG_CPU_SUP_UMC_32 is not set

 # CONFIG_CS5535_GPIO is not set
 # CONFIG_DCDBAS is not set
 # CONFIG_CS5535_GPIO is not set
 # CONFIG_DCDBAS is not set

-# CONFIG_DEBUG_BUGVERBOSE is not set
-# CONFIG_DEBUG_FS is not set
-CONFIG_DECOMPRESS_GZIP=y
+CONFIG_DECOMPRESS_LZMA=y

 CONFIG_DEFAULT_IO_DELAY_TYPE=0
 # CONFIG_DELL_RBU is not set
 CONFIG_DEVPORT=y
 # CONFIG_DMA_API_DEBUG is not set
 CONFIG_DEFAULT_IO_DELAY_TYPE=0
 # CONFIG_DELL_RBU is not set
 CONFIG_DEVPORT=y
 # CONFIG_DMA_API_DEBUG is not set

-CONFIG_DMI=y
-# CONFIG_DMIID is not set
+# CONFIG_DMI is not set

 CONFIG_DOUBLEFAULT=y
 CONFIG_DOUBLEFAULT=y

-CONFIG_EARLY_PRINTK=y
-# CONFIG_EARLY_PRINTK_DBGP is not set
-# CONFIG_EDAC is not set
+# CONFIG_EARLY_PRINTK is not set

 # CONFIG_EDD is not set
 # CONFIG_EUROTECH_WDT is not set
 CONFIG_FAST_CMPXCHG_LOCAL=y
 # CONFIG_FIRMWARE_MEMMAP is not set
 CONFIG_FIX_EARLYCON_MEM=y
 # CONFIG_EDD is not set
 # CONFIG_EUROTECH_WDT is not set
 CONFIG_FAST_CMPXCHG_LOCAL=y
 # CONFIG_FIRMWARE_MEMMAP is not set
 CONFIG_FIX_EARLYCON_MEM=y

-CONFIG_FRAME_POINTER=y
+# CONFIG_FRAME_POINTER is not set

 # CONFIG_FTRACE_SYSCALLS is not set
 CONFIG_GENERIC_BUG=y
 CONFIG_GENERIC_CLOCKEVENTS=y
 # CONFIG_FTRACE_SYSCALLS is not set
 CONFIG_GENERIC_BUG=y
 CONFIG_GENERIC_CLOCKEVENTS=y


@@ -82,11 +73,15 @@ CONFIG_GENERIC_CMOS_UPDATE=y
 CONFIG_GENERIC_FIND_FIRST_BIT=y
 CONFIG_GENERIC_FIND_LAST_BIT=y
 CONFIG_GENERIC_FIND_NEXT_BIT=y
 CONFIG_GENERIC_FIND_FIRST_BIT=y
 CONFIG_GENERIC_FIND_LAST_BIT=y
 CONFIG_GENERIC_FIND_NEXT_BIT=y

+CONFIG_GENERIC_GPIO=y

 CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
 CONFIG_GENERIC_IOMAP=y
 CONFIG_GENERIC_ISA_DMA=y
 # CONFIG_GENERIC_TIME_VSYSCALL is not set
 # CONFIG_GEN_RTC is not set
 CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
 CONFIG_GENERIC_IOMAP=y
 CONFIG_GENERIC_ISA_DMA=y
 # CONFIG_GENERIC_TIME_VSYSCALL is not set
 # CONFIG_GEN_RTC is not set

+CONFIG_GPIOLIB=y
+CONFIG_GPIO_RDC321X=y
+CONFIG_GPIO_SYSFS=y

 # CONFIG_HAMRADIO is not set
 # CONFIG_HANGCHECK_TIMER is not set
 CONFIG_HAS_DMA=y
 # CONFIG_HAMRADIO is not set
 # CONFIG_HANGCHECK_TIMER is not set
 CONFIG_HAS_DMA=y


@@ -127,24 +122,15 @@ CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y
 # CONFIG_HIGH_RES_TIMERS is not set
 # CONFIG_HPET_TIMER is not set
 # CONFIG_HP_WATCHDOG is not set
 # CONFIG_HIGH_RES_TIMERS is not set
 # CONFIG_HPET_TIMER is not set
 # CONFIG_HP_WATCHDOG is not set

-CONFIG_HUGETLBFS=y
-CONFIG_HUGETLB_PAGE=y
-CONFIG_HW_RANDOM=y
-# CONFIG_HW_RANDOM_AMD is not set
-# CONFIG_HW_RANDOM_GEODE is not set
-# CONFIG_HW_RANDOM_INTEL is not set
-# CONFIG_HW_RANDOM_VIA is not set
+# CONFIG_HUGETLBFS is not set
+# CONFIG_HW_RANDOM is not set

 CONFIG_HZ=250
 # CONFIG_HZ_100 is not set
 CONFIG_HZ_250=y
 CONFIG_HZ=250
 # CONFIG_HZ_100 is not set
 CONFIG_HZ_250=y

-# CONFIG_I2C is not set

 # CONFIG_I6300ESB_WDT is not set
 # CONFIG_I8K is not set
 # CONFIG_IB700_WDT is not set
 # CONFIG_IBMASR is not set
 # CONFIG_I6300ESB_WDT is not set
 # CONFIG_I8K is not set
 # CONFIG_IB700_WDT is not set
 # CONFIG_IBMASR is not set

-# CONFIG_IBM_ASM is not set
-CONFIG_ICPLUS_PHY=y
-CONFIG_INITRAMFS_SOURCE=""

 # CONFIG_IOMMU_API is not set
 # CONFIG_IOMMU_HELPER is not set
 CONFIG_IO_DELAY_0X80=y
 # CONFIG_IOMMU_API is not set
 # CONFIG_IOMMU_HELPER is not set
 CONFIG_IO_DELAY_0X80=y


@@ -155,19 +141,22 @@ CONFIG_IO_DELAY_TYPE_0XED=1
 CONFIG_IO_DELAY_TYPE_NONE=3
 CONFIG_IO_DELAY_TYPE_UDELAY=2
 # CONFIG_IO_DELAY_UDELAY is not set
 CONFIG_IO_DELAY_TYPE_NONE=3
 CONFIG_IO_DELAY_TYPE_UDELAY=2
 # CONFIG_IO_DELAY_UDELAY is not set

+# CONFIG_IP_MROUTE is not set

 # CONFIG_ISA is not set
 CONFIG_ISA_DMA_API=y
 # CONFIG_ISCSI_IBFT_FIND is not set
 # CONFIG_ISA is not set
 CONFIG_ISA_DMA_API=y
 # CONFIG_ISCSI_IBFT_FIND is not set

+# CONFIG_ISDN_CAPI is not set
+# CONFIG_ISDN_I4L is not set

 # CONFIG_IT8712F_WDT is not set
 # CONFIG_IT87_WDT is not set
 # CONFIG_ITCO_WDT is not set
 # CONFIG_IT8712F_WDT is not set
 # CONFIG_IT87_WDT is not set
 # CONFIG_ITCO_WDT is not set

-# CONFIG_KERNEL_BZIP2 is not set
-# CONFIG_KERNEL_GZIP is not set
-CONFIG_KERNEL_LZMA=y
-CONFIG_KEXEC=y
+# CONFIG_JFFS2_SUMMARY is not set

 CONFIG_KTIME_SCALAR=y
 CONFIG_KTIME_SCALAR=y

-CONFIG_LBD=y

 # CONFIG_LEDS_ALIX2 is not set
 # CONFIG_LEDS_ALIX2 is not set

+CONFIG_LEDS_GPIO=y
+# CONFIG_LEDS_TRIGGER_HEARTBEAT is not set
+# CONFIG_LEDS_TRIGGER_NETDEV is not set
+# CONFIG_LEDS_TRIGGER_TIMER is not set

 # CONFIG_M386 is not set
 CONFIG_M486=y
 # CONFIG_M586 is not set
 # CONFIG_M386 is not set
 CONFIG_M486=y
 # CONFIG_M586 is not set


@@ -175,14 +164,15 @@ CONFIG_M486=y
 # CONFIG_M586TSC is not set
 # CONFIG_M686 is not set
 # CONFIG_MACHZ_WDT is not set
 # CONFIG_M586TSC is not set
 # CONFIG_M686 is not set
 # CONFIG_MACHZ_WDT is not set

-# CONFIG_MACINTOSH_DRIVERS is not set
-# CONFIG_MATH_EMULATION is not set
+CONFIG_MATH_EMULATION=y

 # CONFIG_MCA is not set
 # CONFIG_MCORE2 is not set
 # CONFIG_MCRUSOE is not set
 # CONFIG_MCYRIXIII is not set
 # CONFIG_MEFFICEON is not set
 # CONFIG_MEMTEST is not set
 # CONFIG_MCA is not set
 # CONFIG_MCORE2 is not set
 # CONFIG_MCRUSOE is not set
 # CONFIG_MCYRIXIII is not set
 # CONFIG_MEFFICEON is not set
 # CONFIG_MEMTEST is not set

+CONFIG_MFD_CORE=y
+CONFIG_MFD_RDC321X=y

 # CONFIG_MGEODEGX1 is not set
 # CONFIG_MGEODE_LX is not set
 # CONFIG_MICROCODE is not set
 # CONFIG_MGEODEGX1 is not set
 # CONFIG_MGEODE_LX is not set
 # CONFIG_MICROCODE is not set


@@ -197,30 +187,19 @@ CONFIG_MODULE_FORCE_UNLOAD=y
 # CONFIG_MPENTIUMM is not set
 # CONFIG_MPSC is not set
 # CONFIG_MTD_CFI_INTELEXT is not set
 # CONFIG_MPENTIUMM is not set
 # CONFIG_MPSC is not set
 # CONFIG_MTD_CFI_INTELEXT is not set

-CONFIG_MTD_CMDLINE_PARTS=y

 # CONFIG_MTD_COMPLEX_MAPPINGS is not set
 # CONFIG_MTD_COMPLEX_MAPPINGS is not set

-CONFIG_MTD_CONCAT=y

 # CONFIG_MTD_NETSC520 is not set
 # CONFIG_MTD_NETSC520 is not set

-# CONFIG_MTD_R8610 is not set
-CONFIG_MTD_RDC3210=y
-CONFIG_MTD_RDC3210_ALLOW_JFFS2=y
-CONFIG_MTD_RDC3210_BUSWIDTH=2
-# CONFIG_MTD_RDC3210_FACTORY_PRESENT is not set
-CONFIG_MTD_RDC3210_SIZE=0x400000
-# CONFIG_MTD_RDC3210_STATIC_MAP is not set
-# CONFIG_MTD_SC520CDP is not set
+CONFIG_MTD_PHYSMAP=y

 # CONFIG_MTD_TS5500 is not set
 # CONFIG_MTRR is not set
 # CONFIG_MVIAC3_2 is not set
 # CONFIG_MVIAC7 is not set
 # CONFIG_MWINCHIP3D is not set
 # CONFIG_MWINCHIPC6 is not set
 # CONFIG_MTD_TS5500 is not set
 # CONFIG_MTRR is not set
 # CONFIG_MVIAC3_2 is not set
 # CONFIG_MVIAC7 is not set
 # CONFIG_MWINCHIP3D is not set
 # CONFIG_MWINCHIPC6 is not set

-# CONFIG_NATSEMI is not set

 # CONFIG_NETDEV_1000 is not set
 CONFIG_NOHIGHMEM=y
 CONFIG_NR_CPUS=1
 # CONFIG_NSC_GPIO is not set
 # CONFIG_NETDEV_1000 is not set
 CONFIG_NOHIGHMEM=y
 CONFIG_NR_CPUS=1
 # CONFIG_NSC_GPIO is not set

-CONFIG_NVRAM=y

 # CONFIG_OLPC is not set
 # CONFIG_OPTIMIZE_INLINING is not set
 CONFIG_PAGEFLAGS_EXTENDED=y
 # CONFIG_OLPC is not set
 # CONFIG_OPTIMIZE_INLINING is not set
 CONFIG_PAGEFLAGS_EXTENDED=y


@@ -240,17 +219,12 @@ CONFIG_PCI_GOANY=y
 # CONFIG_PCI_GOMMCONFIG is not set
 # CONFIG_PCI_GOOLPC is not set
 # CONFIG_PCI_QUIRKS is not set
 # CONFIG_PCI_GOMMCONFIG is not set
 # CONFIG_PCI_GOOLPC is not set
 # CONFIG_PCI_QUIRKS is not set

-# CONFIG_PCSPKR_PLATFORM is not set
-CONFIG_PHYLIB=y

 CONFIG_PHYSICAL_ALIGN=0x100000
 CONFIG_PHYSICAL_START=0x100000
 # CONFIG_POWER_TRACER is not set
 CONFIG_PHYSICAL_ALIGN=0x100000
 CONFIG_PHYSICAL_START=0x100000
 # CONFIG_POWER_TRACER is not set

-# CONFIG_PRINTK is not set
-# CONFIG_PROCESSOR_SELECT is not set
+CONFIG_PROCESSOR_SELECT=y

 # CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set
 # CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set

-CONFIG_RDC321X_WDT=y
-CONFIG_RD_GZIP=y
-# CONFIG_RD_LZMA is not set
+CONFIG_RDC321X_WDT=m

 # CONFIG_RELOCATABLE is not set
 # CONFIG_RTC is not set
 # CONFIG_RWSEM_GENERIC_SPINLOCK is not set
 # CONFIG_RELOCATABLE is not set
 # CONFIG_RTC is not set
 # CONFIG_RWSEM_GENERIC_SPINLOCK is not set


@@ -266,10 +240,7 @@ CONFIG_SCHED_OMIT_FRAME_POINTER=y
 # CONFIG_SCx200 is not set
 # CONFIG_SERIAL_8250_EXTENDED is not set
 # CONFIG_SHMEM is not set
 # CONFIG_SCx200 is not set
 # CONFIG_SERIAL_8250_EXTENDED is not set
 # CONFIG_SHMEM is not set

-# CONFIG_SLAB is not set
-CONFIG_SLOB=y

 # CONFIG_SLOW_WORK is not set
 # CONFIG_SLOW_WORK is not set

-# CONFIG_SMP is not set

 # CONFIG_SMSC37B787_WDT is not set
 # CONFIG_SMSC_SCH311X_WDT is not set
 CONFIG_SPARSEMEM_STATIC=y
 # CONFIG_SMSC37B787_WDT is not set
 # CONFIG_SMSC_SCH311X_WDT is not set
 CONFIG_SPARSEMEM_STATIC=y


@@ -311,12 +282,12 @@ CONFIG_X86_MINIMUM_CPU_FAMILY=4
 # CONFIG_X86_PAE is not set
 # CONFIG_X86_PLATFORM_DEVICES is not set
 CONFIG_X86_POPAD_OK=y
 # CONFIG_X86_PAE is not set
 # CONFIG_X86_PLATFORM_DEVICES is not set
 CONFIG_X86_POPAD_OK=y

-CONFIG_X86_PPRO_FENCE=y
+# CONFIG_X86_PPRO_FENCE is not set

 CONFIG_X86_RDC321X=y
 CONFIG_X86_REBOOTFIXUPS=y
 CONFIG_X86_RDC321X=y
 CONFIG_X86_REBOOTFIXUPS=y

-CONFIG_X86_RESERVE_LOW_64K=y
+# CONFIG_X86_RESERVE_LOW_64K is not set

 # CONFIG_X86_UP_APIC is not set
 # CONFIG_X86_UP_APIC is not set

-CONFIG_X86_VERBOSE_BOOTUP=y
+# CONFIG_X86_VERBOSE_BOOTUP is not set

 CONFIG_X86_WP_WORKS_OK=y
 CONFIG_X86_XADD=y
 # CONFIG_ZONE_DMA32 is not set
 CONFIG_X86_WP_WORKS_OK=y
 CONFIG_X86_XADD=y
 # CONFIG_ZONE_DMA32 is not set