fix wprobe conflict with libnl

[openwrt.git] / target / linux / generic-2.6 / config-2.6.30

diff --git a/target/linux/generic-2.6/config-2.6.30 b/target/linux/generic-2.6/config-2.6.30
index 23d3775..98904d9 100644 (file)
--- a/target/linux/generic-2.6/config-2.6.30
+++ b/target/linux/generic-2.6/config-2.6.30
@@ -1,4 +1,3 @@
-

 # CONFIG_6PACK is not set
 # CONFIG_8139CP is not set
 # CONFIG_8139TOO is not set
 # CONFIG_6PACK is not set
 # CONFIG_8139CP is not set
 # CONFIG_8139TOO is not set


@@ -868,6 +867,7 @@ CONFIG_JOLIET=y
 # CONFIG_LATENCYTOP is not set
 # CONFIG_LBD is not set
 # CONFIG_LDM_PARTITION is not set
 # CONFIG_LATENCYTOP is not set
 # CONFIG_LBD is not set
 # CONFIG_LDM_PARTITION is not set

+# CONFIG_LEDS_ALIX is not set

 # CONFIG_LEDS_BD2802 is not set
 CONFIG_LEDS_CLASS=y
 # CONFIG_LEDS_DAC124S085 is not set
 # CONFIG_LEDS_BD2802 is not set
 CONFIG_LEDS_CLASS=y
 # CONFIG_LEDS_DAC124S085 is not set


@@ -994,18 +994,13 @@ CONFIG_MTD_COMPLEX_MAPPINGS=y
 # CONFIG_MTD_CONCAT is not set
 # CONFIG_MTD_DATAFLASH is not set
 # CONFIG_MTD_DEBUG is not set
 # CONFIG_MTD_CONCAT is not set
 # CONFIG_MTD_DATAFLASH is not set
 # CONFIG_MTD_DEBUG is not set

-# CONFIG_MTD_DEBUG is not set
-# CONFIG_MTD_DOC2000 is not set

 # CONFIG_MTD_DOC2000 is not set
 # CONFIG_MTD_DOC2001 is not set
 # CONFIG_MTD_DOC2000 is not set
 # CONFIG_MTD_DOC2001 is not set

-# CONFIG_MTD_DOC2001 is not set
-# CONFIG_MTD_DOC2001PLUS is not set

 # CONFIG_MTD_DOC2001PLUS is not set
 CONFIG_MTD_GEN_PROBE=y
 # CONFIG_MTD_INTEL_VR_NOR is not set
 # CONFIG_MTD_JEDECPROBE is not set
 # CONFIG_MTD_LPDDR is not set
 # CONFIG_MTD_DOC2001PLUS is not set
 CONFIG_MTD_GEN_PROBE=y
 # CONFIG_MTD_INTEL_VR_NOR is not set
 # CONFIG_MTD_JEDECPROBE is not set
 # CONFIG_MTD_LPDDR is not set

-# CONFIG_MTD_LPDDR is not set

 # CONFIG_MTD_M25P80 is not set
 # CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
 CONFIG_MTD_MAP_BANK_WIDTH_1=y
 # CONFIG_MTD_M25P80 is not set
 # CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
 CONFIG_MTD_MAP_BANK_WIDTH_1=y


@@ -1489,9 +1484,11 @@ CONFIG_RTC_DRV_CMOS=y
 # CONFIG_RTC_DRV_DS1390 is not set
 # CONFIG_RTC_DRV_DS1511 is not set
 # CONFIG_RTC_DRV_DS1553 is not set
 # CONFIG_RTC_DRV_DS1390 is not set
 # CONFIG_RTC_DRV_DS1511 is not set
 # CONFIG_RTC_DRV_DS1553 is not set

+# CONFIG_RTC_DRV_DS1672 is not set

 # CONFIG_RTC_DRV_DS1742 is not set
 # CONFIG_RTC_DRV_DS3234 is not set
 # CONFIG_RTC_DRV_FM3130 is not set
 # CONFIG_RTC_DRV_DS1742 is not set
 # CONFIG_RTC_DRV_DS3234 is not set
 # CONFIG_RTC_DRV_FM3130 is not set

+# CONFIG_RTC_DRV_ISL1208 is not set

 # CONFIG_RTC_DRV_M41T80 is not set
 # CONFIG_RTC_DRV_M41T94 is not set
 # CONFIG_RTC_DRV_M48T35 is not set
 # CONFIG_RTC_DRV_M41T80 is not set
 # CONFIG_RTC_DRV_M41T94 is not set
 # CONFIG_RTC_DRV_M48T35 is not set


@@ -1499,6 +1496,8 @@ CONFIG_RTC_DRV_CMOS=y
 # CONFIG_RTC_DRV_M48T86 is not set
 # CONFIG_RTC_DRV_MAX6900 is not set
 # CONFIG_RTC_DRV_MAX6902 is not set
 # CONFIG_RTC_DRV_M48T86 is not set
 # CONFIG_RTC_DRV_MAX6900 is not set
 # CONFIG_RTC_DRV_MAX6902 is not set

+# CONFIG_RTC_DRV_PCF50606 is not set
+# CONFIG_RTC_DRV_PCF8563 is not set

 # CONFIG_RTC_DRV_PCF8583 is not set
 # CONFIG_RTC_DRV_R9701 is not set
 # CONFIG_RTC_DRV_RS5C348 is not set
 # CONFIG_RTC_DRV_PCF8583 is not set
 # CONFIG_RTC_DRV_R9701 is not set
 # CONFIG_RTC_DRV_RS5C348 is not set


@@ -1509,10 +1508,18 @@ CONFIG_RTC_DRV_CMOS=y
 # CONFIG_RTC_DRV_STK17TA8 is not set
 # CONFIG_RTC_DRV_TEST is not set
 # CONFIG_RTC_DRV_V3020 is not set
 # CONFIG_RTC_DRV_STK17TA8 is not set
 # CONFIG_RTC_DRV_TEST is not set
 # CONFIG_RTC_DRV_V3020 is not set

+# CONFIG_RTC_DRV_X1205 is not set
+CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
+CONFIG_RTC_HCTOSYS=y

 # CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
 # CONFIG_RTC_INTF_DEV_UIE_EMUL is not set

+CONFIG_RTC_INTF_DEV=y
+CONFIG_RTC_INTF_PROC=y
+CONFIG_RTC_INTF_SYSFS=y
+CONFIG_RTC_LIB=y

 # CONFIG_RTL8180 is not set
 # CONFIG_RTL8187 is not set
 CONFIG_RT_MUTEXES=y
 # CONFIG_RTL8180 is not set
 # CONFIG_RTL8187 is not set
 CONFIG_RT_MUTEXES=y

+CONFIG_RWSEM_GENERIC_SPINLOCK=y

 # CONFIG_S2IO is not set
 # CONFIG_SAMPLES is not set
 # CONFIG_SATA_AHCI is not set
 # CONFIG_S2IO is not set
 # CONFIG_SAMPLES is not set
 # CONFIG_SATA_AHCI is not set


@@ -1602,6 +1609,7 @@ CONFIG_SCSI_PROC_FS=y
 # CONFIG_SCSI_TGT is not set
 # CONFIG_SCSI_U14_34F is not set
 # CONFIG_SCSI_ULTRASTOR is not set
 # CONFIG_SCSI_TGT is not set
 # CONFIG_SCSI_U14_34F is not set
 # CONFIG_SCSI_ULTRASTOR is not set

+CONFIG_SCSI_WAIT_SCAN=m

 # CONFIG_SECCOMP is not set
 # CONFIG_SECURITY_FILE_CAPABILITIES is not set
 # CONFIG_SECURITYFS is not set
 # CONFIG_SECCOMP is not set
 # CONFIG_SECURITY_FILE_CAPABILITIES is not set
 # CONFIG_SECURITYFS is not set


@@ -1859,6 +1867,8 @@ CONFIG_SND_VERBOSE_PROCFS=y
 # CONFIG_SOUND is not set
 # CONFIG_SOUND_PRIME is not set
 # CONFIG_SPARSEMEM_MANUAL is not set
 # CONFIG_SOUND is not set
 # CONFIG_SOUND_PRIME is not set
 # CONFIG_SPARSEMEM_MANUAL is not set

+# CONFIG_SPARSEMEM_STATIC is not set
+# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set

 # CONFIG_SPI_AT25 is not set
 # CONFIG_SPI_DEBUG is not set
 # CONFIG_SPI is not set
 # CONFIG_SPI_AT25 is not set
 # CONFIG_SPI_DEBUG is not set
 # CONFIG_SPI is not set


@@ -1872,6 +1882,7 @@ CONFIG_SQUASHFS=y
 # CONFIG_SSB_DEBUG is not set
 # CONFIG_SSB is not set
 # CONFIG_SSB_PCMCIAHOST is not set
 # CONFIG_SSB_DEBUG is not set
 # CONFIG_SSB is not set
 # CONFIG_SSB_PCMCIAHOST is not set

+CONFIG_SSB_POSSIBLE=y

 # CONFIG_SSB_SILENT is not set
 # CONFIG_SSFDC is not set
 # CONFIG_STACK_TRACER is not set
 # CONFIG_SSB_SILENT is not set
 # CONFIG_SSFDC is not set
 # CONFIG_STACK_TRACER is not set


@@ -1903,6 +1914,7 @@ CONFIG_SYSFS=y
 # CONFIG_SYS_HYPERVISOR is not set
 # CONFIG_SYSV68_PARTITION is not set
 # CONFIG_SYSV_FS is not set
 # CONFIG_SYS_HYPERVISOR is not set
 # CONFIG_SYSV68_PARTITION is not set
 # CONFIG_SYSV_FS is not set

+CONFIG_SYSVIPC_SYSCTL=y

 CONFIG_SYSVIPC=y
 # CONFIG_TASKSTATS is not set
 # CONFIG_TCG_TPM is not set
 CONFIG_SYSVIPC=y
 # CONFIG_TASKSTATS is not set
 # CONFIG_TCG_TPM is not set