diff options
| author | Frederic Weisbecker | 2009-10-18 01:09:09 +0200 |
|---|---|---|
| committer | Frederic Weisbecker | 2009-10-18 01:12:33 +0200 |
| commit | 0f8f86c7bdd1c954fbe153af437a0d91a6c5721a (patch) | |
| tree | 94a8d419a470a4f9852ca397bb9bbe48db92ff5c /drivers/staging/Kconfig | |
| parent | Merge branch 'linus' into tracing/hw-breakpoints (diff) | |
| parent | perf tools: Move dereference after NULL test (diff) | |
| download | kernel-qcow2-linux-0f8f86c7bdd1c954fbe153af437a0d91a6c5721a.tar.gz kernel-qcow2-linux-0f8f86c7bdd1c954fbe153af437a0d91a6c5721a.tar.xz kernel-qcow2-linux-0f8f86c7bdd1c954fbe153af437a0d91a6c5721a.zip | |
Merge commit 'perf/core' into perf/hw-breakpoint
Conflicts:
kernel/Makefile
kernel/trace/Makefile
kernel/trace/trace.h
samples/Makefile
Merge reason: We need to be uptodate with the perf events development
branch because we plan to rewrite the breakpoints API on top of
perf events.
Diffstat (limited to 'drivers/staging/Kconfig')
| -rw-r--r-- | drivers/staging/Kconfig | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig index 975ecddbce30..7df3ba4f1f4d 100644 --- a/drivers/staging/Kconfig +++ b/drivers/staging/Kconfig @@ -45,14 +45,10 @@ source "drivers/staging/et131x/Kconfig" source "drivers/staging/slicoss/Kconfig" -source "drivers/staging/sxg/Kconfig" - -source "drivers/staging/me4000/Kconfig" - -source "drivers/staging/meilhaus/Kconfig" - source "drivers/staging/go7007/Kconfig" +source "drivers/staging/cx25821/Kconfig" + source "drivers/staging/usbip/Kconfig" source "drivers/staging/winbond/Kconfig" @@ -61,19 +57,15 @@ source "drivers/staging/wlan-ng/Kconfig" source "drivers/staging/echo/Kconfig" -source "drivers/staging/at76_usb/Kconfig" - source "drivers/staging/poch/Kconfig" -source "drivers/staging/agnx/Kconfig" - source "drivers/staging/otus/Kconfig" source "drivers/staging/rt2860/Kconfig" source "drivers/staging/rt2870/Kconfig" -source "drivers/staging/rt3070/Kconfig" +source "drivers/staging/rt3090/Kconfig" source "drivers/staging/comedi/Kconfig" @@ -87,16 +79,16 @@ source "drivers/staging/rtl8187se/Kconfig" source "drivers/staging/rtl8192su/Kconfig" -source "drivers/staging/rspiusb/Kconfig" +source "drivers/staging/rtl8192e/Kconfig" source "drivers/staging/mimio/Kconfig" source "drivers/staging/frontier/Kconfig" -source "drivers/staging/epl/Kconfig" - source "drivers/staging/android/Kconfig" +source "drivers/staging/dream/Kconfig" + source "drivers/staging/dst/Kconfig" source "drivers/staging/pohmelfs/Kconfig" @@ -109,8 +101,6 @@ source "drivers/staging/phison/Kconfig" source "drivers/staging/p9auth/Kconfig" -source "drivers/staging/heci/Kconfig" - source "drivers/staging/line6/Kconfig" source "drivers/gpu/drm/radeon/Kconfig" @@ -119,13 +109,23 @@ source "drivers/staging/octeon/Kconfig" source "drivers/staging/serqt_usb2/Kconfig" -source "drivers/staging/vt6655/Kconfig" +source "drivers/staging/quatech_usb2/Kconfig" -source "drivers/staging/cpc-usb/Kconfig" +source "drivers/staging/vt6655/Kconfig" -source "drivers/staging/pata_rdc/Kconfig" +source "drivers/staging/vt6656/Kconfig" source "drivers/staging/udlfb/Kconfig" +source "drivers/staging/hv/Kconfig" + +source "drivers/staging/vme/Kconfig" + +source "drivers/staging/rar/Kconfig" + +source "drivers/staging/sep/Kconfig" + +source "drivers/staging/iio/Kconfig" + endif # !STAGING_EXCLUDE_BUILD endif # STAGING |