diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-02-10 18:58:25 (GMT) |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-02-10 18:58:25 (GMT) |
commit | b91867f2ee5c84b550f95ce54c91b180f70f48cb (patch) | |
tree | bd7a5be4484d539af13e6b345320455e989612cf /drivers/staging/Kconfig | |
parent | b05ee6bf9e6c7acc38dca1466b63bb24ae5df6f3 (diff) | |
parent | 9196dc1129fbb3ecf93027224a6bdbc86d086e3a (diff) | |
download | linux-b91867f2ee5c84b550f95ce54c91b180f70f48cb.tar.xz |
Merge tag 'staging-3.3-rc3' into staging-next
This was done to resolve some merge issues with the following files that
had changed in both branches:
drivers/staging/rtl8712/rtl871x_sta_mgt.c
drivers/staging/tidspbridge/rmgr/drv_interface.c
drivers/staging/zcache/zcache-main.c
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/Kconfig')
-rw-r--r-- | drivers/staging/Kconfig | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig index 9e63472..fae2e24 100644 --- a/drivers/staging/Kconfig +++ b/drivers/staging/Kconfig @@ -88,6 +88,8 @@ source "drivers/staging/zram/Kconfig" source "drivers/staging/zcache/Kconfig" +source "drivers/staging/zsmalloc/Kconfig" + source "drivers/staging/wlags49_h2/Kconfig" source "drivers/staging/wlags49_h25/Kconfig" @@ -128,4 +130,6 @@ source "drivers/staging/omapdrm/Kconfig" source "drivers/staging/android/Kconfig" +source "drivers/staging/telephony/Kconfig" + endif # STAGING |