summaryrefslogtreecommitdiffstats
path: root/config-generic
diff options
context:
space:
mode:
authorPeter Robinson <pbrobinson@gmail.com>2016-04-03 23:45:44 +0100
committerPeter Robinson <pbrobinson@gmail.com>2016-04-03 23:45:44 +0100
commit6daf6840fbc08d905dd7ce31b488b8f544404b83 (patch)
treeada101d19ba6020e02f9c516d4e0d40b44678559 /config-generic
parent2c8998104c8d2ba5c803a342bcade205ccb1d357 (diff)
downloadkernel-6daf6840fbc08d905dd7ce31b488b8f544404b83.tar.gz
kernel-6daf6840fbc08d905dd7ce31b488b8f544404b83.tar.xz
kernel-6daf6840fbc08d905dd7ce31b488b8f544404b83.zip
Some minor ARMv7/aarch64 cleanups
Diffstat (limited to 'config-generic')
-rw-r--r--config-generic5
1 files changed, 1 insertions, 4 deletions
diff --git a/config-generic b/config-generic
index c80f957e5..42430fbbb 100644
--- a/config-generic
+++ b/config-generic
@@ -219,7 +219,6 @@ CONFIG_BINFMT_MISC=m
# CONFIG_COMMON_CLK_CS2000_CP is not set
# CONFIG_COMMON_CLK_PWM is not set
# CONFIG_COMMON_CLK_CDCE925 is not set
-# CONFIG_COMMON_CLK_HI6220 is not set
#
#
@@ -2085,6 +2084,7 @@ CONFIG_CAN_PEAK_PCIEC=y
CONFIG_CAN_PEAK_USB=m
CONFIG_CAN_KVASER_PCI=m
CONFIG_CAN_KVASER_USB=m
+# CONFIG_CAN_MCP251X is not set
CONFIG_CAN_PLX_PCI=m
# CONFIG_CAN_TSCAN1 is not set
CONFIG_CAN_C_CAN=m
@@ -2099,7 +2099,6 @@ CONFIG_CAN_GS_USB=m
CONFIG_CAN_8DEV_USB=m
CONFIG_CAN_SOFTING=m
# CONFIG_CAN_SOFTING_CS is not set
-CONFIG_CAN_SUN4I=m
CONFIG_CAN_IFI_CANFD=m
CONFIG_NETROM=m
@@ -4355,8 +4354,6 @@ CONFIG_USB_ULPI_BUS=m
# CONFIG_PHY_PXA_28NM_HSIC is not set
# CONFIG_PHY_PXA_28NM_USB2 is not set
# CONFIG_PHY_TUSB1210 is not set
-# CONFIG_PHY_HI6220_USB is not set
-# CONFIG_AM335X_PHY_USB is not set
# CONFIG_SAMSUNG_USBPHY is not set
# CONFIG_BCM_KONA_USB2_PHY is not set
# CONFIG_USB_RCAR_PHY is not set