ssb: activate CONFIG_SSB_BLOCKIO in the kernel and not in compat-wireless.

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

diff --git a/target/linux/generic-2.6/config-2.6.25 b/target/linux/generic-2.6/config-2.6.25
index ba93a32..a97db40 100644 (file)
--- a/target/linux/generic-2.6/config-2.6.25
+++ b/target/linux/generic-2.6/config-2.6.25
@@ -723,13 +723,6 @@ CONFIG_IPW2200_MONITOR=y
 # CONFIG_IPX is not set
 # CONFIG_IRDA is not set
 # CONFIG_ISCSI_TCP is not set
 # CONFIG_IPX is not set
 # CONFIG_IRDA is not set
 # CONFIG_ISCSI_TCP is not set

-# CONFIG_ISDN_CAPI_CAPI20 is not set
-CONFIG_ISDN_CAPI_CAPIFS_BOOL=y
-# CONFIG_ISDN_CAPI_CAPIFS is not set
-# CONFIG_ISDN_CAPI is not set
-CONFIG_ISDN_CAPI_MIDDLEWARE=y
-# CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON is not set
-# CONFIG_ISDN_I4L is not set

 # CONFIG_ISDN is not set
 # CONFIG_ISO9660_FS is not set
 # CONFIG_IXGB is not set
 # CONFIG_ISDN is not set
 # CONFIG_ISO9660_FS is not set
 # CONFIG_IXGB is not set


@@ -765,7 +758,7 @@ CONFIG_JOLIET=y
 CONFIG_KMOD=y
 # CONFIG_LAPB is not set
 # CONFIG_LASAT is not set
 CONFIG_KMOD=y
 # CONFIG_LAPB is not set
 # CONFIG_LASAT is not set

-# CONFIG_LBD is not set
+CONFIG_LBD=y

 # CONFIG_LDM_PARTITION is not set
 CONFIG_LEDS_CLASS=y
 CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
 # CONFIG_LDM_PARTITION is not set
 CONFIG_LEDS_CLASS=y
 CONFIG_LEDS_TRIGGER_DEFAULT_ON=y


@@ -1080,11 +1073,11 @@ CONFIG_NFSD_TCP=y
 # CONFIG_NFSD_V2_ACL is not set
 # CONFIG_NFSD_V3_ACL is not set
 CONFIG_NFSD_V3=y
 # CONFIG_NFSD_V2_ACL is not set
 # CONFIG_NFSD_V3_ACL is not set
 CONFIG_NFSD_V3=y

-CONFIG_NFSD_V4=y
+# CONFIG_NFSD_V4 is not set

 # CONFIG_NFS_FS is not set
 # CONFIG_NFS_V3_ACL is not set
 CONFIG_NFS_V3=y
 # CONFIG_NFS_FS is not set
 # CONFIG_NFS_V3_ACL is not set
 CONFIG_NFS_V3=y

-CONFIG_NFS_V4=y
+# CONFIG_NFS_V4 is not set

 # CONFIG_NFTL is not set
 # CONFIG_NLS_ASCII is not set
 # CONFIG_NLS_CODEPAGE_1250 is not set
 # CONFIG_NFTL is not set
 # CONFIG_NLS_ASCII is not set
 # CONFIG_NLS_CODEPAGE_1250 is not set


@@ -1135,10 +1128,13 @@ CONFIG_NLS_DEFAULT="iso8859-1"
 # CONFIG_NTFS_RW is not set
 # CONFIG_NVRAM is not set
 # CONFIG_OCF_BENCH is not set
 # CONFIG_NTFS_RW is not set
 # CONFIG_NVRAM is not set
 # CONFIG_OCF_BENCH is not set

+# CONFIG_OCF_C7108 is not set
+# CONFIG_OCF_CRYPTOCTEON is not set

 # CONFIG_OCF_EP80579 is not set
 # CONFIG_OCF_HIFNHIPP is not set
 # CONFIG_OCF_HIFN is not set
 # CONFIG_OCF_IXP4XX is not set
 # CONFIG_OCF_EP80579 is not set
 # CONFIG_OCF_HIFNHIPP is not set
 # CONFIG_OCF_HIFN is not set
 # CONFIG_OCF_IXP4XX is not set

+# CONFIG_OCF_KIRKWOOD is not set

 # CONFIG_OCF_OCF is not set
 # CONFIG_OCF_OCFNULL is not set
 # CONFIG_OCFS2_FS is not set
 # CONFIG_OCF_OCF is not set
 # CONFIG_OCF_OCFNULL is not set
 # CONFIG_OCFS2_FS is not set


@@ -1201,12 +1197,12 @@ CONFIG_PARTITION_ADVANCED=y
 # CONFIG_PC300TOO is not set
 # CONFIG_PCCARD is not set
 # CONFIG_PCF8575 is not set
 # CONFIG_PC300TOO is not set
 # CONFIG_PCCARD is not set
 # CONFIG_PCF8575 is not set

+# CONFIG_PCI is not set

 # CONFIG_PCI_ATMEL is not set
 # CONFIG_PCI_HERMES is not set
 # CONFIG_PCI_LEGACY is not set
 # CONFIG_PCI_MSI is not set
 CONFIG_PCI_SYSCALL=y
 # CONFIG_PCI_ATMEL is not set
 # CONFIG_PCI_HERMES is not set
 # CONFIG_PCI_LEGACY is not set
 # CONFIG_PCI_MSI is not set
 CONFIG_PCI_SYSCALL=y

-CONFIG_PCI=y

 # CONFIG_PCMCIA_AHA152X is not set
 # CONFIG_PCMCIA_ATMEL is not set
 # CONFIG_PCMCIA_DEBUG is not set
 # CONFIG_PCMCIA_AHA152X is not set
 # CONFIG_PCMCIA_ATMEL is not set
 # CONFIG_PCMCIA_DEBUG is not set