deduplicate kernel source files from 2.6.30-2.6.32 by moving them to generic files/

[openwrt.git] / target / linux / cobalt / config-default

diff --git a/target/linux/cobalt/config-default b/target/linux/cobalt/config-default
index 2396808..b0ecd14 100644 (file)
--- a/target/linux/cobalt/config-default
+++ b/target/linux/cobalt/config-default
@@ -8,10 +8,6 @@ CONFIG_ARCH_SUPPORTS_OPROFILE=y
 CONFIG_ARCH_SUSPEND_POSSIBLE=y
 # CONFIG_ARPD is not set
 CONFIG_ATA=y
 CONFIG_ARCH_SUSPEND_POSSIBLE=y
 # CONFIG_ARPD is not set
 CONFIG_ATA=y

-# CONFIG_ATA_NONSTANDARD is not set
-# CONFIG_ATA_PIIX is not set
-CONFIG_ATA_SFF=y
-CONFIG_BASE_SMALL=0

 # CONFIG_BCM47XX is not set
 # CONFIG_BINARY_PRINTF is not set
 CONFIG_BINFMT_ELF32=y
 # CONFIG_BCM47XX is not set
 # CONFIG_BINARY_PRINTF is not set
 CONFIG_BINFMT_ELF32=y


@@ -25,10 +21,10 @@ CONFIG_BLOCK_COMPAT=y
 # CONFIG_CAVIUM_OCTEON_REFERENCE_BOARD is not set
 # CONFIG_CAVIUM_OCTEON_SIMULATOR is not set
 CONFIG_CEVT_GT641XX=y
 # CONFIG_CAVIUM_OCTEON_REFERENCE_BOARD is not set
 # CONFIG_CAVIUM_OCTEON_SIMULATOR is not set
 CONFIG_CEVT_GT641XX=y

-CONFIG_CEVT_R4K=y

 CONFIG_CEVT_R4K_LIB=y
 CONFIG_CEVT_R4K_LIB=y

-CONFIG_COMPAT=y
+CONFIG_CEVT_R4K=y

 CONFIG_COMPAT_BRK=y
 CONFIG_COMPAT_BRK=y

+CONFIG_COMPAT=y

 CONFIG_CONSOLE_TRANSLATIONS=y
 # CONFIG_CPU_BIG_ENDIAN is not set
 # CONFIG_CPU_CAVIUM_OCTEON is not set
 CONFIG_CONSOLE_TRANSLATIONS=y
 # CONFIG_CPU_BIG_ENDIAN is not set
 # CONFIG_CPU_CAVIUM_OCTEON is not set


@@ -59,8 +55,8 @@ CONFIG_CPU_SUPPORTS_64BIT_KERNEL=y
 # CONFIG_CPU_TX49XX is not set
 # CONFIG_CPU_VR41XX is not set
 CONFIG_CRC16=y
 # CONFIG_CPU_TX49XX is not set
 # CONFIG_CPU_VR41XX is not set
 CONFIG_CRC16=y

-CONFIG_CSRC_R4K=y

 CONFIG_CSRC_R4K_LIB=y
 CONFIG_CSRC_R4K_LIB=y

+CONFIG_CSRC_R4K=y

 CONFIG_DE2104X=y
 # CONFIG_DE4X5 is not set
 # CONFIG_DEBUG_FS is not set
 CONFIG_DE2104X=y
 # CONFIG_DE4X5 is not set
 # CONFIG_DEBUG_FS is not set


@@ -75,15 +71,15 @@ CONFIG_DUMMY_CONSOLE=y
 CONFIG_EARLY_PRINTK=y
 CONFIG_ELF_CORE=y
 CONFIG_ENABLE_MUST_CHECK=y
 CONFIG_EARLY_PRINTK=y
 CONFIG_ELF_CORE=y
 CONFIG_ENABLE_MUST_CHECK=y

-CONFIG_FB=y

 CONFIG_FB_COBALT=y
 CONFIG_FB_COBALT=y

+CONFIG_FB=y

 # CONFIG_FIRMWARE_EDID is not set
 CONFIG_FIRMWARE_IN_KERNEL=y
 # CONFIG_FRAMEBUFFER_CONSOLE is not set
 CONFIG_FS_POSIX_ACL=y
 CONFIG_GENERIC_ACL=y
 # CONFIG_FIRMWARE_EDID is not set
 CONFIG_FIRMWARE_IN_KERNEL=y
 # CONFIG_FRAMEBUFFER_CONSOLE is not set
 CONFIG_FS_POSIX_ACL=y
 CONFIG_GENERIC_ACL=y

-CONFIG_GENERIC_CLOCKEVENTS=y

 CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
 CONFIG_GENERIC_CLOCKEVENTS_BUILD=y

+CONFIG_GENERIC_CLOCKEVENTS=y

 CONFIG_GENERIC_CMOS_UPDATE=y
 CONFIG_GENERIC_FIND_LAST_BIT=y
 CONFIG_GENERIC_FIND_NEXT_BIT=y
 CONFIG_GENERIC_CMOS_UPDATE=y
 CONFIG_GENERIC_FIND_LAST_BIT=y
 CONFIG_GENERIC_FIND_NEXT_BIT=y


@@ -104,18 +100,17 @@ CONFIG_HID_SUPPORT=y
 CONFIG_HW_CONSOLE=y
 CONFIG_HW_HAS_PCI=y
 # CONFIG_HW_RANDOM is not set
 CONFIG_HW_CONSOLE=y
 CONFIG_HW_HAS_PCI=y
 # CONFIG_HW_RANDOM is not set

-CONFIG_HZ=250

 # CONFIG_HZ_100 is not set
 # CONFIG_HZ_100 is not set

+CONFIG_HZ=250

 CONFIG_HZ_250=y
 CONFIG_HZ_250=y

-# CONFIG_I2C is not set

 CONFIG_I8253=y
 CONFIG_I8259=y
 CONFIG_I8253=y
 CONFIG_I8259=y

-CONFIG_INOTIFY=y

 CONFIG_INOTIFY_USER=y
 CONFIG_INOTIFY_USER=y

-CONFIG_INPUT=y
+CONFIG_INOTIFY=y

 CONFIG_INPUT_COBALT_BTNS=y
 CONFIG_INPUT_EVDEV=y
 CONFIG_INPUT_POLLDEV=y
 CONFIG_INPUT_COBALT_BTNS=y
 CONFIG_INPUT_EVDEV=y
 CONFIG_INPUT_POLLDEV=y

+CONFIG_INPUT=y

 # CONFIG_INPUT_YEALINK is not set
 # CONFIG_IP_ADVANCED_ROUTER is not set
 # CONFIG_IP_MULTICAST is not set
 # CONFIG_INPUT_YEALINK is not set
 # CONFIG_IP_ADVANCED_ROUTER is not set
 # CONFIG_IP_MULTICAST is not set


@@ -129,8 +124,8 @@ CONFIG_LEDS_COBALT_RAQ=y
 # CONFIG_LEDS_TRIGGER_DEFAULT_ON is not set
 # CONFIG_LEDS_TRIGGER_HEARTBEAT is not set
 # CONFIG_LEDS_TRIGGER_TIMER is not set
 # CONFIG_LEDS_TRIGGER_DEFAULT_ON is not set
 # CONFIG_LEDS_TRIGGER_HEARTBEAT is not set
 # CONFIG_LEDS_TRIGGER_TIMER is not set

-CONFIG_LEGACY_PTYS=y

 CONFIG_LEGACY_PTY_COUNT=256
 CONFIG_LEGACY_PTY_COUNT=256

+CONFIG_LEGACY_PTYS=y

 # CONFIG_LEMOTE_FULONG is not set
 # CONFIG_LOGO is not set
 # CONFIG_MACH_ALCHEMY is not set
 # CONFIG_LEMOTE_FULONG is not set
 # CONFIG_LOGO is not set
 # CONFIG_MACH_ALCHEMY is not set


@@ -141,12 +136,10 @@ CONFIG_LEGACY_PTY_COUNT=256
 # CONFIG_MACH_VR41XX is not set
 # CONFIG_MII is not set
 # CONFIG_MIKROTIK_RB532 is not set
 # CONFIG_MACH_VR41XX is not set
 # CONFIG_MII is not set
 # CONFIG_MIKROTIK_RB532 is not set

-CONFIG_MIPS=y

 CONFIG_MIPS32_COMPAT=y
 CONFIG_MIPS32_N32=y
 CONFIG_MIPS32_O32=y
 CONFIG_MIPS_COBALT=y
 CONFIG_MIPS32_COMPAT=y
 CONFIG_MIPS32_N32=y
 CONFIG_MIPS32_O32=y
 CONFIG_MIPS_COBALT=y

-# CONFIG_MIPS_FPU_EMU is not set

 CONFIG_MIPS_L1_CACHE_SHIFT=5
 # CONFIG_MIPS_MACHINE is not set
 # CONFIG_MIPS_MALTA is not set
 CONFIG_MIPS_L1_CACHE_SHIFT=5
 # CONFIG_MIPS_MACHINE is not set
 # CONFIG_MIPS_MALTA is not set


@@ -154,11 +147,12 @@ CONFIG_MIPS_MT_DISABLED=y
 # CONFIG_MIPS_MT_SMP is not set
 # CONFIG_MIPS_MT_SMTC is not set
 # CONFIG_MIPS_SIM is not set
 # CONFIG_MIPS_MT_SMP is not set
 # CONFIG_MIPS_MT_SMTC is not set
 # CONFIG_MIPS_SIM is not set

+CONFIG_MIPS=y

 # CONFIG_MISC_DEVICES is not set
 # CONFIG_MTD_BLOCK is not set
 # CONFIG_MTD_BLOCK_RO is not set
 # CONFIG_MISC_DEVICES is not set
 # CONFIG_MTD_BLOCK is not set
 # CONFIG_MTD_BLOCK_RO is not set

-# CONFIG_MTD_CFI is not set

 # CONFIG_MTD_CFI_INTELEXT is not set
 # CONFIG_MTD_CFI_INTELEXT is not set

+# CONFIG_MTD_CFI is not set

 # CONFIG_MTD_COMPLEX_MAPPINGS is not set
 CONFIG_MTD_JEDECPROBE=y
 CONFIG_MTD_PHYSMAP=y
 # CONFIG_MTD_COMPLEX_MAPPINGS is not set
 CONFIG_MTD_JEDECPROBE=y
 CONFIG_MTD_PHYSMAP=y


@@ -172,7 +166,6 @@ CONFIG_NET_TULIP=y
 CONFIG_PAGEFLAGS_EXTENDED=y
 # CONFIG_PARTITION_ADVANCED is not set
 CONFIG_PATA_VIA=y
 CONFIG_PAGEFLAGS_EXTENDED=y
 # CONFIG_PARTITION_ADVANCED is not set
 CONFIG_PATA_VIA=y

-CONFIG_PCI=y

 CONFIG_PCI_DISABLE_COMMON_QUIRKS=y
 CONFIG_PCI_DOMAINS=y
 CONFIG_PCI_GT64XXX_PCI0=y
 CONFIG_PCI_DISABLE_COMMON_QUIRKS=y
 CONFIG_PCI_DOMAINS=y
 CONFIG_PCI_GT64XXX_PCI0=y


@@ -190,9 +183,9 @@ CONFIG_RTC_CLASS=y
 CONFIG_RTC_INTF_DEV_UIE_EMUL=y
 CONFIG_SATA_PMP=y
 CONFIG_SCHED_OMIT_FRAME_POINTER=y
 CONFIG_RTC_INTF_DEV_UIE_EMUL=y
 CONFIG_SATA_PMP=y
 CONFIG_SCHED_OMIT_FRAME_POINTER=y

-CONFIG_SCSI=y

 # CONFIG_SCSI_LOWLEVEL is not set
 # CONFIG_SCSI_MULTI_LUN is not set
 # CONFIG_SCSI_LOWLEVEL is not set
 # CONFIG_SCSI_MULTI_LUN is not set

+CONFIG_SCSI=y

 CONFIG_SECCOMP=y
 # CONFIG_SERIAL_8250_EXTENDED is not set
 CONFIG_SERIAL_8250_NR_UARTS=4
 CONFIG_SECCOMP=y
 # CONFIG_SERIAL_8250_EXTENDED is not set
 CONFIG_SERIAL_8250_NR_UARTS=4


@@ -212,28 +205,28 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=4
 # CONFIG_SLAB is not set
 # CONFIG_SLOW_WORK is not set
 CONFIG_SLUB=y
 # CONFIG_SLAB is not set
 # CONFIG_SLOW_WORK is not set
 CONFIG_SLUB=y

-CONFIG_SYSVIPC_COMPAT=y

 CONFIG_SYS_HAS_CPU_NEVADA=y
 CONFIG_SYS_HAS_EARLY_PRINTK=y
 CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y
 CONFIG_SYS_SUPPORTS_64BIT_KERNEL=y
 CONFIG_SYS_SUPPORTS_ARBIT_HZ=y
 CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y
 CONFIG_SYS_HAS_CPU_NEVADA=y
 CONFIG_SYS_HAS_EARLY_PRINTK=y
 CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y
 CONFIG_SYS_SUPPORTS_64BIT_KERNEL=y
 CONFIG_SYS_SUPPORTS_ARBIT_HZ=y
 CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y

+CONFIG_SYSVIPC_COMPAT=y

 CONFIG_TMPFS_POSIX_ACL=y
 CONFIG_TRACING_SUPPORT=y
 CONFIG_TMPFS_POSIX_ACL=y
 CONFIG_TRACING_SUPPORT=y

-CONFIG_TULIP=y

 CONFIG_TULIP_MMIO=y
 CONFIG_TULIP_MWI=y
 CONFIG_TULIP_MMIO=y
 CONFIG_TULIP_MWI=y

-CONFIG_TULIP_NAPI=y

 CONFIG_TULIP_NAPI_HW_MITIGATION=y
 CONFIG_TULIP_NAPI_HW_MITIGATION=y

+CONFIG_TULIP_NAPI=y
+CONFIG_TULIP=y

 # CONFIG_ULI526X is not set
 CONFIG_USB_SUPPORT=y
 # CONFIG_VGA_CONSOLE is not set
 # CONFIG_VLAN_8021Q is not set
 CONFIG_VM_EVENT_COUNTERS=y
 # CONFIG_ULI526X is not set
 CONFIG_USB_SUPPORT=y
 # CONFIG_VGA_CONSOLE is not set
 # CONFIG_VLAN_8021Q is not set
 CONFIG_VM_EVENT_COUNTERS=y

-CONFIG_VT=y

 CONFIG_VT_CONSOLE=y
 CONFIG_VT_HW_CONSOLE_BINDING=y
 CONFIG_VT_CONSOLE=y
 CONFIG_VT_HW_CONSOLE_BINDING=y

+CONFIG_VT=y

 # CONFIG_WATCHDOG is not set
 # CONFIG_WINBOND_840 is not set
 # CONFIG_WLAN_80211 is not set
 # CONFIG_WATCHDOG is not set
 # CONFIG_WINBOND_840 is not set
 # CONFIG_WLAN_80211 is not set