diff options
| author | Josh Boyer <jwboyer@redhat.com> | 2011-11-03 09:28:35 -0400 |
|---|---|---|
| committer | Josh Boyer <jwboyer@redhat.com> | 2011-11-03 09:30:13 -0400 |
| commit | 6cc3fe9c50dc52f19cdb990f0013ade5bcba35e1 (patch) | |
| tree | 8d016b24d1c470ab8ce72ec936f60317dcd028f6 /config-generic | |
| parent | 906f34d53bd601a61ff7567e00495c78aa5f62ef (diff) | |
| download | kernel-6cc3fe9c50dc52f19cdb990f0013ade5bcba35e1.tar.gz kernel-6cc3fe9c50dc52f19cdb990f0013ade5bcba35e1.tar.xz kernel-6cc3fe9c50dc52f19cdb990f0013ade5bcba35e1.zip | |
Linux 3.1-git5 (upstream 43672a0784707)
Diffstat (limited to 'config-generic')
| -rw-r--r-- | config-generic | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/config-generic b/config-generic index e56124b05..6ae1e84b3 100644 --- a/config-generic +++ b/config-generic @@ -68,6 +68,7 @@ CONFIG_SLUB=y CONFIG_MISC_DEVICES=y # CONFIG_AD525X_DPOT is not set +# CONFIG_ATMEL_PWM is not set CONFIG_IWMC3200TOP=m # CONFIG_IWMC3200TOP_DEBUG is not set CONFIG_IWMC3200TOP_DEBUGFS=y @@ -434,6 +435,7 @@ CONFIG_BLK_DEV_IDEDMA=y CONFIG_VIRTIO_BLK=m CONFIG_VIRTIO_PCI=y CONFIG_VIRTIO_BALLOON=m +CONFIG_VIRTIO_MMIO=m CONFIG_VIRTIO_NET=m CONFIG_VMXNET3=m CONFIG_HW_RANDOM_VIRTIO=m @@ -691,6 +693,9 @@ CONFIG_DM_DEBUG=y CONFIG_DM_MIRROR=y CONFIG_DM_MULTIPATH=m CONFIG_DM_SNAPSHOT=y +CONFIG_DM_THIN_PROVISIONING=m +# CONFIG_DM_DEBUG_BLOCK_STACK_TRACING is not set +# CONFIG_DM_DEBUG_SPACE_MAPS is not set CONFIG_DM_UEVENT=y CONFIG_DM_ZERO=y CONFIG_DM_LOG_USERSPACE=m @@ -4546,6 +4551,7 @@ CONFIG_PPS_CLIENT_LDISC=m # CONFIG_PPS_DEBUG is not set CONFIG_PPS_CLIENT_PARPORT=m CONFIG_PPS_GENERATOR_PARPORT=m +CONFIG_PPS_CLIENT_GPIO=m CONFIG_NTP_PPS=y CONFIG_PTP_1588_CLOCK=m @@ -4591,6 +4597,8 @@ CONFIG_BLK_DEV_DRBD=m # CONFIG_KEYBOARD_GPIO is not set # CONFIG_KEYBOARD_GPIO_POLLED is not set # CONFIG_MOUSE_GPIO is not set +# CONFIG_I2C_DESIGNWARE_PLATFORM is not set +# CONFIG_I2C_DESIGNWARE_PCI is not set # CONFIG_I2C_GPIO is not set # CONFIG_DEBUG_GPIO is not set # CONFIG_W1_MASTER_GPIO is not set |