summaryrefslogtreecommitdiffstats
path: root/config-generic
diff options
context:
space:
mode:
authorPeter Robinson <pbrobinson@gmail.com>2014-09-30 14:29:26 +0100
committerPeter Robinson <pbrobinson@gmail.com>2014-09-30 14:29:26 +0100
commit05b52e7e93e6bb9042e0147762a4bbc9a241b404 (patch)
tree6bfcbab75478096b4bdaf7aca6ab6ac1320a6dac /config-generic
parent8462484ef2e9db49c8435ac67821f8b97e96159c (diff)
downloadkernel-05b52e7e93e6bb9042e0147762a4bbc9a241b404.tar.gz
kernel-05b52e7e93e6bb9042e0147762a4bbc9a241b404.tar.xz
kernel-05b52e7e93e6bb9042e0147762a4bbc9a241b404.zip
Don't build Exynos4 on lpae kernel, Add dts for BananaPi, Minor ARM updates, Build 6lowpan modules
Diffstat (limited to 'config-generic')
-rw-r--r--config-generic30
1 files changed, 15 insertions, 15 deletions
diff --git a/config-generic b/config-generic
index 414db23ff..df445fa9e 100644
--- a/config-generic
+++ b/config-generic
@@ -1865,6 +1865,20 @@ CONFIG_MWIFIEX_SDIO=m
CONFIG_MWIFIEX_PCIE=m
CONFIG_MWIFIEX_USB=m
+CONFIG_IEEE802154=m
+CONFIG_IEEE802154_6LOWPAN=m
+CONFIG_IEEE802154_DRIVERS=m
+CONFIG_IEEE802154_FAKEHARD=m
+CONFIG_IEEE802154_FAKELB=m
+# CONFIG_IEEE802154_AT86RF230 is not set
+# CONFIG_IEEE802154_MRF24J40 is not set
+# CONFIG_IEEE802154_CC2520 is not set
+
+CONFIG_MAC802154=m
+CONFIG_NET_MPLS_GSO=m
+
+CONFIG_6LOWPAN=m
+
#
# Token Ring devices
#
@@ -1974,7 +1988,7 @@ CONFIG_WINBOND_FIR=m
# Bluetooth support
#
CONFIG_BT=m
-# CONFIG_BT_6LOWPAN is not set
+CONFIG_BT_6LOWPAN=m
CONFIG_BT_L2CAP=y
CONFIG_BT_SCO=y
CONFIG_BT_CMTP=m
@@ -5052,8 +5066,6 @@ CONFIG_NET_DSA_MV88E6123_61_65=m
# Used by Maemo, we don't care.
# CONFIG_PHONET is not set
-# CONFIG_6LOWPAN is not set
-
# CONFIG_ICS932S401 is not set
# CONFIG_ATMEL_SSC is not set
@@ -5217,18 +5229,6 @@ CONFIG_FSNOTIFY=y
CONFIG_FANOTIFY=y
CONFIG_FANOTIFY_ACCESS_PERMISSIONS=y
-CONFIG_IEEE802154=m
-CONFIG_IEEE802154_6LOWPAN=m
-CONFIG_IEEE802154_DRIVERS=m
-CONFIG_IEEE802154_FAKEHARD=m
-CONFIG_IEEE802154_FAKELB=m
-# CONFIG_IEEE802154_AT86RF230 is not set
-# CONFIG_IEEE802154_MRF24J40 is not set
-# CONFIG_IEEE802154_CC2520 is not set
-
-CONFIG_MAC802154=m
-CONFIG_NET_MPLS_GSO=m
-
# CONFIG_HSR is not set
# CONFIG_EXTCON is not set