diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2010-08-05 14:18:03 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-08-05 14:18:03 -0700 |
| commit | e9563355ac1175dd3440dc2ea5c28b27ed51a283 (patch) | |
| tree | 8546d55832714b5d19ba4c7799266918ca04882e /drivers/staging/Kconfig | |
| parent | cdd854bc42b5e6c79bbbc40c6600d995ffe6e747 (diff) | |
| parent | b12d1995f650e92f26184afd28e6cf40bf64467a (diff) | |
| download | op-kernel-dev-e9563355ac1175dd3440dc2ea5c28b27ed51a283.zip op-kernel-dev-e9563355ac1175dd3440dc2ea5c28b27ed51a283.tar.gz | |
Staging: Merge staging-next into Linus's tree
Conflicts:
drivers/staging/Kconfig
drivers/staging/batman-adv/bat_sysfs.c
drivers/staging/batman-adv/device.c
drivers/staging/batman-adv/hard-interface.c
drivers/staging/cx25821/cx25821-audups11.c
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/Kconfig')
| -rw-r--r-- | drivers/staging/Kconfig | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig index 0e4122e..4a7a7a7 100644 --- a/drivers/staging/Kconfig +++ b/drivers/staging/Kconfig @@ -97,6 +97,8 @@ source "drivers/staging/octeon/Kconfig" source "drivers/staging/serqt_usb2/Kconfig" +source "drivers/staging/spectra/Kconfig" + source "drivers/staging/quatech_usb2/Kconfig" source "drivers/staging/vt6655/Kconfig" @@ -115,7 +117,7 @@ source "drivers/staging/sep/Kconfig" source "drivers/staging/iio/Kconfig" -source "drivers/staging/ramzswap/Kconfig" +source "drivers/staging/zram/Kconfig" source "drivers/staging/wlags49_h2/Kconfig" @@ -127,8 +129,6 @@ source "drivers/staging/samsung-laptop/Kconfig" source "drivers/staging/sm7xx/Kconfig" -source "drivers/staging/dt3155/Kconfig" - source "drivers/staging/dt3155v4l/Kconfig" source "drivers/staging/crystalhd/Kconfig" @@ -147,5 +147,13 @@ source "drivers/staging/msm/Kconfig" source "drivers/staging/lirc/Kconfig" +source "drivers/staging/easycap/Kconfig" + +source "drivers/staging/solo6x10/Kconfig" + +source "drivers/staging/tidspbridge/Kconfig" + +source "drivers/staging/quickstart/Kconfig" + endif # !STAGING_EXCLUDE_BUILD endif # STAGING |
