diff options
| author | Josh Boyer <jwboyer@redhat.com> | 2012-05-25 16:38:51 -0400 |
|---|---|---|
| committer | Josh Boyer <jwboyer@redhat.com> | 2012-05-25 16:38:51 -0400 |
| commit | 6226546ba136b84d1fabfbbc3dda4300781b9617 (patch) | |
| tree | 1cd44d12f599932aef71bfcfd9f823194b51090d | |
| parent | e0c91dab8a0fdec02e7b89eaeb5235ccfd63d541 (diff) | |
| download | kernel-6226546ba136b84d1fabfbbc3dda4300781b9617.tar.gz kernel-6226546ba136b84d1fabfbbc3dda4300781b9617.tar.xz kernel-6226546ba136b84d1fabfbbc3dda4300781b9617.zip | |
Fixup LBD/LBDAF config options
CONFIG_LBD was renamed to CONFIG_LBDAF in 2009, and it's only an option on
32-bit platforms
| -rw-r--r-- | config-arm-generic | 2 | ||||
| -rw-r--r-- | config-generic | 2 | ||||
| -rw-r--r-- | config-powerpc32-generic | 2 | ||||
| -rw-r--r-- | config-x86-32-generic | 2 |
4 files changed, 6 insertions, 2 deletions
diff --git a/config-arm-generic b/config-arm-generic index 5aabaa67b..6137f6f64 100644 --- a/config-arm-generic +++ b/config-arm-generic @@ -81,6 +81,8 @@ CONFIG_LEDS=y CONFIG_LEDS_CPU=y CONFIG_LEDS_GPIO=m +CONFIG_LBDAF=y + CONFIG_RFKILL_GPIO=m CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y diff --git a/config-generic b/config-generic index f96d3b598..467f46427 100644 --- a/config-generic +++ b/config-generic @@ -253,13 +253,11 @@ CONFIG_BLK_DEV_RAM_COUNT=16 CONFIG_BLK_DEV_RAM_SIZE=16384 CONFIG_BLK_DEV_INITRD=y CONFIG_BLK_DEV_ATIIXP=y -CONFIG_LBD=y CONFIG_BLK_DEV_IO_TRACE=y CONFIG_BLK_DEV_DELKIN=m # CONFIG_BLK_DEV_IT8213 is not set # CONFIG_BLK_DEV_TC86C001 is not set -CONFIG_LBDAF=y CONFIG_BLK_DEV_BSG=y CONFIG_BLK_DEV_BSGLIB=y CONFIG_BLK_DEV_INTEGRITY=y diff --git a/config-powerpc32-generic b/config-powerpc32-generic index e856b9ff0..976e45e64 100644 --- a/config-powerpc32-generic +++ b/config-powerpc32-generic @@ -33,6 +33,8 @@ CONFIG_SCSI_MESH=m CONFIG_SCSI_MESH_SYNC_RATE=5 CONFIG_SCSI_MESH_RESET_DELAY_MS=4000 +CONFIG_LBDAF=y + CONFIG_SCSI_MAC53C94=m CONFIG_ADB_CUDA=y CONFIG_ADB_MACIO=y diff --git a/config-x86-32-generic b/config-x86-32-generic index 7625c2f35..70e872a88 100644 --- a/config-x86-32-generic +++ b/config-x86-32-generic @@ -138,6 +138,8 @@ CONFIG_XEN_MAX_DOMAIN_MEMORY=8 CONFIG_MTD_NAND_CAFE=m +CONFIG_LBDAF=y + # CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set |