diff options
| author |   Greg Kroah-Hartman <gregkh@suse.de> | 2010-05-21 12:48:55 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-05-21 12:48:55 -0700 |
| commit | c8d1a126924fcbc1d61ceb830226e0c7afdcc841 (patch) | |
| tree | d3f3c850481c33b7f433175e83a189f958b1b868 /drivers/staging/Kconfig | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke/nilfs2 (diff) | |
| parent | Staging: ramzswap: Handler for swap slot free callback (diff) | |
| download | linux-dev-c8d1a126924fcbc1d61ceb830226e0c7afdcc841.tar.xz linux-dev-c8d1a126924fcbc1d61ceb830226e0c7afdcc841.zip | |
Merge staging-next tree into Linus's latest version
Conflicts:
drivers/staging/arlan/arlan-main.c
drivers/staging/comedi/drivers/cb_das16_cs.c
drivers/staging/cx25821/cx25821-alsa.c
drivers/staging/dt3155/dt3155_drv.c
drivers/staging/hv/hv.c
drivers/staging/netwave/netwave_cs.c
drivers/staging/wavelan/wavelan.c
drivers/staging/wavelan/wavelan_cs.c
drivers/staging/wlags49_h2/wl_cs.c
This required a bit of hand merging due to the conflicts
that happened in the later .34-rc releases, as well as
some staging driver changing coming in through other trees
(v4l and pcmcia).
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/Kconfig')
| -rw-r--r-- | drivers/staging/Kconfig | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig index 5589616082e7..b5c3b3013037 100644 --- a/drivers/staging/Kconfig +++ b/drivers/staging/Kconfig @@ -59,8 +59,6 @@ source "drivers/staging/wlan-ng/Kconfig" source "drivers/staging/echo/Kconfig" -source "drivers/staging/poch/Kconfig" - source "drivers/staging/otus/Kconfig" source "drivers/staging/rt2860/Kconfig" @@ -113,6 +111,8 @@ source "drivers/staging/vme/Kconfig" source "drivers/staging/rar_register/Kconfig" +source "drivers/staging/memrar/Kconfig" + source "drivers/staging/sep/Kconfig" source "drivers/staging/iio/Kconfig" @@ -127,19 +127,19 @@ source "drivers/staging/batman-adv/Kconfig" source "drivers/staging/samsung-laptop/Kconfig" -source "drivers/staging/strip/Kconfig" +source "drivers/staging/sm7xx/Kconfig" -source "drivers/staging/arlan/Kconfig" +source "drivers/staging/dt3155/Kconfig" -source "drivers/staging/wavelan/Kconfig" +source "drivers/staging/dt3155v4l/Kconfig" -source "drivers/staging/netwave/Kconfig" +source "drivers/staging/crystalhd/Kconfig" -source "drivers/staging/sm7xx/Kconfig" +source "drivers/staging/cxt1e1/Kconfig" -source "drivers/staging/dt3155/Kconfig" +source "drivers/staging/ti-st/Kconfig" -source "drivers/staging/crystalhd/Kconfig" +source "drivers/staging/adis16255/Kconfig" endif # !STAGING_EXCLUDE_BUILD endif # STAGING |