merge madwifi r2591 for rxantenna selection

[openwrt.git] / target / linux / x86-2.6 / config / default

diff --git a/target/linux/x86-2.6/config/default b/target/linux/x86-2.6/config/default
index 242e90e..0fc4bf4 100644 (file)
--- a/target/linux/x86-2.6/config/default
+++ b/target/linux/x86-2.6/config/default
@@ -20,12 +20,13 @@ CONFIG_ARCH_POPULATES_NODE_MAP=y
 CONFIG_ARCH_SELECT_MEMORY_MODEL=y
 CONFIG_ARCH_SPARSEMEM_ENABLE=y
 # CONFIG_ARLAN is not set
 CONFIG_ARCH_SELECT_MEMORY_MODEL=y
 CONFIG_ARCH_SPARSEMEM_ENABLE=y
 # CONFIG_ARLAN is not set

+# CONFIG_ARCH_SUPPORTS_MSI is not set

 # CONFIG_AT1700 is not set
 CONFIG_ATA=m
 # CONFIG_ATA_GENERIC is not set
 # CONFIG_ATA_NONSTANDARD is not set
 CONFIG_ATA_PIIX=m
 # CONFIG_AT1700 is not set
 CONFIG_ATA=m
 # CONFIG_ATA_GENERIC is not set
 # CONFIG_ATA_NONSTANDARD is not set
 CONFIG_ATA_PIIX=m

-# CONFIG_B44 is not set
+# CONFIG_ATM_DRIVERS is not set

 CONFIG_BASE_SMALL=0
 # CONFIG_BINFMT_AOUT is not set
 CONFIG_BITREVERSE=y
 CONFIG_BASE_SMALL=0
 # CONFIG_BINFMT_AOUT is not set
 CONFIG_BITREVERSE=y


@@ -73,6 +74,7 @@ CONFIG_CRYPTO_TWOFISH_586=m
 # CONFIG_DEBUG_BUGVERBOSE is not set
 # CONFIG_DELL_RBU is not set
 # CONFIG_DEPCA is not set
 # CONFIG_DEBUG_BUGVERBOSE is not set
 # CONFIG_DELL_RBU is not set
 # CONFIG_DEPCA is not set

+CONFIG_DEVPORT=y

 # CONFIG_DMASCC is not set
 CONFIG_DMI=y
 CONFIG_DOUBLEFAULT=y
 # CONFIG_DMASCC is not set
 CONFIG_DMI=y
 CONFIG_DOUBLEFAULT=y


@@ -97,10 +99,10 @@ CONFIG_GENERIC_CLOCKEVENTS=y
 CONFIG_GENERIC_IOMAP=y
 CONFIG_GENERIC_ISA_DMA=y
 # CONFIG_HANGCHECK_TIMER is not set
 CONFIG_GENERIC_IOMAP=y
 CONFIG_GENERIC_ISA_DMA=y
 # CONFIG_HANGCHECK_TIMER is not set

+CONFIG_HAS_DMA=y

 CONFIG_HAS_IOMEM=y
 CONFIG_HAS_IOPORT=y
 CONFIG_HID=y
 CONFIG_HAS_IOMEM=y
 CONFIG_HAS_IOPORT=y
 CONFIG_HID=y

-# CONFIG_HID_DEBUG is not set

 # CONFIG_HIGHMEM4G is not set
 # CONFIG_HIGHMEM64G is not set
 # CONFIG_HIGH_RES_TIMERS is not set
 # CONFIG_HIGHMEM4G is not set
 # CONFIG_HIGHMEM64G is not set
 # CONFIG_HIGH_RES_TIMERS is not set


@@ -116,11 +118,9 @@ CONFIG_HW_RANDOM=y
 CONFIG_HW_RANDOM_GEODE=y
 # CONFIG_HW_RANDOM_INTEL is not set
 CONFIG_HW_RANDOM_VIA=y
 CONFIG_HW_RANDOM_GEODE=y
 # CONFIG_HW_RANDOM_INTEL is not set
 CONFIG_HW_RANDOM_VIA=y

-CONFIG_HZ=100
-CONFIG_HZ_100=y
-# CONFIG_HZ_250 is not set

 CONFIG_I2C=m
 CONFIG_I2C_ALGOBIT=m
 CONFIG_I2C=m
 CONFIG_I2C_ALGOBIT=m

+CONFIG_I2C_BOARDINFO=y

 CONFIG_I2C_CHARDEV=m
 CONFIG_I2C_ISA=m
 # CONFIG_I6300ESB_WDT is not set
 CONFIG_I2C_CHARDEV=m
 CONFIG_I2C_ISA=m
 # CONFIG_I6300ESB_WDT is not set


@@ -134,11 +134,13 @@ CONFIG_IDE=y
 # CONFIG_IDEDISK_MULTI_MODE is not set
 # CONFIG_IDEDMA_IVB is not set
 # CONFIG_IDEDMA_ONLYDISK is not set
 # CONFIG_IDEDISK_MULTI_MODE is not set
 # CONFIG_IDEDMA_IVB is not set
 # CONFIG_IDEDMA_ONLYDISK is not set

+CONFIG_IDEPCI_PCIBUS_ORDER=y

 CONFIG_IDEPCI_SHARE_IRQ=y
 # CONFIG_IDE_ARM is not set
 # CONFIG_IDE_CHIPSETS is not set
 CONFIG_IDE_GENERIC=y
 CONFIG_IDE_MAX_HWIFS=4
 CONFIG_IDEPCI_SHARE_IRQ=y
 # CONFIG_IDE_ARM is not set
 # CONFIG_IDE_CHIPSETS is not set
 CONFIG_IDE_GENERIC=y
 CONFIG_IDE_MAX_HWIFS=4

+# CONFIG_IDE_PROC_FS is not set

 # CONFIG_IDE_TASK_IOCTL is not set
 CONFIG_INITRAMFS_SOURCE=""
 CONFIG_INPUT=y
 # CONFIG_IDE_TASK_IOCTL is not set
 CONFIG_INITRAMFS_SOURCE=""
 CONFIG_INPUT=y


@@ -149,6 +151,7 @@ CONFIG_INPUT_MOUSEDEV=y
 CONFIG_INPUT_MOUSEDEV_PSAUX=y
 CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
 CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
 CONFIG_INPUT_MOUSEDEV_PSAUX=y
 CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
 CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768

+# CONFIG_INPUT_POLLDEV is not set

 # CONFIG_IP_NF_SET_IPPORTHASH is not set
 CONFIG_ISA=y
 CONFIG_ISAPNP=y
 # CONFIG_IP_NF_SET_IPPORTHASH is not set
 CONFIG_ISA=y
 CONFIG_ISAPNP=y


@@ -167,6 +170,7 @@ CONFIG_KTIME_SCALAR=y
 CONFIG_LEDS_NET48XX=m
 # CONFIG_LEDS_TRIGGER_IDE_DISK is not set
 # CONFIG_LEDS_WRAP is not set
 CONFIG_LEDS_NET48XX=m
 # CONFIG_LEDS_TRIGGER_IDE_DISK is not set
 # CONFIG_LEDS_WRAP is not set

+# CONFIG_LIBERTAS 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


@@ -174,6 +178,7 @@ 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_MCA is not set
 # CONFIG_MCORE2 is not set
 # CONFIG_MATH_EMULATION is not set
 # CONFIG_MCA is not set
 # CONFIG_MCORE2 is not set


@@ -188,10 +193,17 @@ CONFIG_M486=y
 # CONFIG_MK6 is not set
 # CONFIG_MK7 is not set
 # CONFIG_MK8 is not set
 # CONFIG_MK6 is not set
 # CONFIG_MK7 is not set
 # CONFIG_MK8 is not set

+# CONFIG_MOUSE_APPLETOUCH is not set

 # CONFIG_MOUSE_INPORT is not set
 # CONFIG_MOUSE_LOGIBM is not set
 # CONFIG_MOUSE_PC110PAD is not set
 CONFIG_MOUSE_PS2=y
 # CONFIG_MOUSE_INPORT is not set
 # CONFIG_MOUSE_LOGIBM is not set
 # CONFIG_MOUSE_PC110PAD is not set
 CONFIG_MOUSE_PS2=y

+# CONFIG_MOUSE_PS2_ALPS is not set
+# CONFIG_MOUSE_PS2_LIFEBOOK is not set
+# CONFIG_MOUSE_PS2_LOGIPS2PP is not set
+# CONFIG_MOUSE_PS2_SYNAPTICS is not set
+# CONFIG_MOUSE_PS2_TOUCHKIT is not set
+# CONFIG_MOUSE_PS2_TRACKPOINT is not set

 # CONFIG_MOUSE_SERIAL is not set
 # CONFIG_MOUSE_VSXXXAA is not set
 # CONFIG_MPENTIUM4 is not set
 # CONFIG_MOUSE_SERIAL is not set
 # CONFIG_MOUSE_VSXXXAA is not set
 # CONFIG_MPENTIUM4 is not set


@@ -237,35 +249,28 @@ CONFIG_MTD_PARTITIONS=y
 # CONFIG_MTD_TS5500 is not set
 # CONFIG_MTRR is not set
 # CONFIG_MVIAC3_2 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_MWAVE is not set
 # CONFIG_MWINCHIP2 is not set
 # CONFIG_MWINCHIP3D is not set
 # CONFIG_MWINCHIPC6 is not set
 CONFIG_NATSEMI=m
 CONFIG_NE2K_PCI=m
 # CONFIG_MWAVE is not set
 # CONFIG_MWINCHIP2 is not set
 # CONFIG_MWINCHIP3D is not set
 # CONFIG_MWINCHIPC6 is not set
 CONFIG_NATSEMI=m
 CONFIG_NE2K_PCI=m

+CONFIG_NETDEV_1000=y

 # CONFIG_NET_ISA is not set
 # CONFIG_NET_SB1000 is not set
 CONFIG_NET_SCH_FIFO=y
 CONFIG_NET_VENDOR_3COM=y
 # CONFIG_NET_VENDOR_RACAL is not set
 # CONFIG_NET_VENDOR_SMC is not set
 # CONFIG_NET_ISA is not set
 # CONFIG_NET_SB1000 is not set
 CONFIG_NET_SCH_FIFO=y
 CONFIG_NET_VENDOR_3COM=y
 # CONFIG_NET_VENDOR_RACAL is not set
 # CONFIG_NET_VENDOR_SMC is not set

-CONFIG_NF_CONNTRACK=y
-CONFIG_NF_CONNTRACK_MARK=y
-CONFIG_NF_CT_ACCT=y
-# CONFIG_NF_NAT_AMANDA is not set
-CONFIG_NF_NAT_FTP=m
-CONFIG_NF_NAT_H323=m
-CONFIG_NF_NAT_IRC=m
-CONFIG_NF_NAT_NEEDED=y
-# CONFIG_NF_NAT_PPTP is not set
-CONFIG_NF_NAT_SIP=m
-# CONFIG_NF_NAT_TFTP is not set

 CONFIG_NOHIGHMEM=y
 # CONFIG_NO_HZ is not set
 CONFIG_NOHIGHMEM=y
 # CONFIG_NO_HZ is not set

+CONFIG_NR_QUICK=1

 CONFIG_NSC_GPIO=m
 CONFIG_NVRAM=y
 CONFIG_PAGE_OFFSET=0xC0000000
 # CONFIG_PARAVIRT is not set
 CONFIG_NSC_GPIO=m
 CONFIG_NVRAM=y
 CONFIG_PAGE_OFFSET=0xC0000000
 # CONFIG_PARAVIRT is not set

+CONFIG_PARPORT_PC=m

 CONFIG_PC8736x_GPIO=m
 # CONFIG_PC87413_WDT is not set
 CONFIG_PCCARD=m
 CONFIG_PC8736x_GPIO=m
 # CONFIG_PC87413_WDT is not set
 CONFIG_PCCARD=m


@@ -291,6 +296,7 @@ CONFIG_PNP=y
 # CONFIG_PNPACPI is not set
 # CONFIG_PNPBIOS is not set
 # CONFIG_PNP_DEBUG is not set
 # CONFIG_PNPACPI is not set
 # CONFIG_PNPBIOS is not set
 # CONFIG_PNP_DEBUG is not set

+CONFIG_QUICKLIST=y

 # CONFIG_RELOCATABLE is not set
 CONFIG_RTC=y
 CONFIG_RWSEM_XCHGADD_ALGORITHM=y
 # CONFIG_RELOCATABLE is not set
 CONFIG_RTC=y
 CONFIG_RWSEM_XCHGADD_ALGORITHM=y


@@ -301,6 +307,7 @@ CONFIG_SATA_INTEL_COMBINED=y
 CONFIG_SC1200_WDT=m
 # CONFIG_SC520_WDT is not set
 # CONFIG_SCC is not set
 CONFIG_SC1200_WDT=m
 # CONFIG_SC520_WDT is not set
 # CONFIG_SCC is not set

+CONFIG_SCSI_WAIT_SCAN=m

 CONFIG_SCx200=y
 CONFIG_SCx200HR_TIMER=y
 CONFIG_SCx200_ACB=m
 CONFIG_SCx200=y
 CONFIG_SCx200HR_TIMER=y
 CONFIG_SCx200_ACB=m


@@ -311,6 +318,8 @@ CONFIG_SCx200_I2C_SDA=13
 CONFIG_SCx200_WDT=m
 # CONFIG_SECCOMP is not set
 CONFIG_SEMAPHORE_SLEEPERS=y
 CONFIG_SCx200_WDT=m
 # CONFIG_SECCOMP is not set
 CONFIG_SEMAPHORE_SLEEPERS=y

+# CONFIG_SENSORS_APPLESMC is not set
+# CONFIG_SENSORS_CORETEMP is not set

 CONFIG_SENSORS_PC87360=m
 # CONFIG_SERIAL_8250_CS is not set
 # CONFIG_SERIAL_8250_EXTENDED is not set
 CONFIG_SENSORS_PC87360=m
 # CONFIG_SERIAL_8250_CS is not set
 # CONFIG_SERIAL_8250_EXTENDED is not set


@@ -349,6 +358,7 @@ CONFIG_USB_OHCI_HCD=m
 # CONFIG_USB_STORAGE_ISD200 is not set
 CONFIG_USB_UHCI_HCD=m
 # CONFIG_VGACON_SOFT_SCROLLBACK is not set
 # CONFIG_USB_STORAGE_ISD200 is not set
 CONFIG_USB_UHCI_HCD=m
 # CONFIG_VGACON_SOFT_SCROLLBACK is not set

+# CONFIG_VGASTATE is not set

 CONFIG_VGA_CONSOLE=y
 CONFIG_VIA_RHINE=m
 # CONFIG_VIA_RHINE_MMIO is not set
 CONFIG_VGA_CONSOLE=y
 CONFIG_VIA_RHINE=m
 # CONFIG_VIA_RHINE_MMIO is not set


@@ -357,6 +367,7 @@ CONFIG_VIA_RHINE_NAPI=y
 # CONFIG_VM86 is not set
 # CONFIG_VMSPLIT_1G is not set
 # CONFIG_VMSPLIT_2G is not set
 # CONFIG_VM86 is not set
 # CONFIG_VMSPLIT_1G is not set
 # CONFIG_VMSPLIT_2G is not set

+# CONFIG_VMSPLIT_2G_OPT is not set

 CONFIG_VMSPLIT_3G=y
 # CONFIG_VMSPLIT_3G_OPT is not set
 CONFIG_VORTEX=m
 CONFIG_VMSPLIT_3G=y
 # CONFIG_VMSPLIT_3G_OPT is not set
 CONFIG_VORTEX=m


@@ -390,6 +401,7 @@ CONFIG_X86_INVLPG=y
 CONFIG_X86_L1_CACHE_SHIFT=4
 # CONFIG_X86_LONGRUN is not set
 # CONFIG_X86_MCE is not set
 CONFIG_X86_L1_CACHE_SHIFT=4
 # CONFIG_X86_LONGRUN is not set
 # CONFIG_X86_MCE is not set

+CONFIG_X86_MINIMUM_CPU_MODEL=4

 # CONFIG_X86_MSR is not set
 # CONFIG_X86_NUMAQ is not set
 # CONFIG_X86_P4_CLOCKMOD is not set
 # CONFIG_X86_MSR is not set
 # CONFIG_X86_NUMAQ is not set
 # CONFIG_X86_P4_CLOCKMOD is not set


@@ -409,5 +421,4 @@ CONFIG_X86_PPRO_FENCE=y
 # CONFIG_X86_VISWS is not set
 # CONFIG_X86_VOYAGER is not set
 CONFIG_X86_WP_WORKS_OK=y
 # CONFIG_X86_VISWS is not set
 # CONFIG_X86_VOYAGER is not set
 CONFIG_X86_WP_WORKS_OK=y

-CONFIG_ZONE_DMA=y
-CONFIG_ZONE_DMA_FLAG=1
+CONFIG_X86_XADD=y