summaryrefslogtreecommitdiffstats
path: root/kernel-i686-fedora.config
diff options
context:
space:
mode:
Diffstat (limited to 'kernel-i686-fedora.config')
-rw-r--r--kernel-i686-fedora.config34
1 files changed, 15 insertions, 19 deletions
diff --git a/kernel-i686-fedora.config b/kernel-i686-fedora.config
index b7b62548c..bd45b9338 100644
--- a/kernel-i686-fedora.config
+++ b/kernel-i686-fedora.config
@@ -701,12 +701,8 @@ CONFIG_CACHEFILES=m
CONFIG_CAN_8DEV_USB=m
CONFIG_CAN_BCM=m
CONFIG_CAN_CALC_BITTIMING=y
-# CONFIG_CAN_CC770_ISA is not set
-CONFIG_CAN_CC770=m
-CONFIG_CAN_CC770_PLATFORM=m
-CONFIG_CAN_C_CAN=m
-CONFIG_CAN_C_CAN_PCI=m
-CONFIG_CAN_C_CAN_PLATFORM=m
+# CONFIG_CAN_CC770 is not set
+# CONFIG_CAN_C_CAN is not set
# CONFIG_CAN_DEBUG_DEVICES is not set
CONFIG_CAN_DEV=m
CONFIG_CAN_EMS_PCI=m
@@ -720,29 +716,29 @@ CONFIG_CAN_GS_USB=m
CONFIG_CAN_GW=m
CONFIG_CAN_HI311X=m
CONFIG_CAN_IFI_CANFD=m
-# CONFIG_CAN_ISOTP is not set
-# CONFIG_CAN_J1939 is not set
+CONFIG_CAN_ISOTP=m
+CONFIG_CAN_J1939=m
# CONFIG_CAN_KVASER_PCIEFD is not set
CONFIG_CAN_KVASER_PCI=m
CONFIG_CAN_KVASER_USB=m
+# CONFIG_CAN_LEDS is not set
CONFIG_CAN=m
CONFIG_CAN_M_CAN=m
-# CONFIG_CAN_M_CAN_PCI is not set
+CONFIG_CAN_M_CAN_PCI=m
# CONFIG_CAN_M_CAN_PLATFORM is not set
# CONFIG_CAN_M_CAN_TCAN4X5X is not set
CONFIG_CAN_MCBA_USB=m
-# CONFIG_CAN_MCP251XFD is not set
-# CONFIG_CAN_MCP251X is not set
-CONFIG_CAN_PEAK_PCIEC=y
+CONFIG_CAN_MCP251XFD=m
+# CONFIG_CAN_MCP251XFD_SANITY is not set
+CONFIG_CAN_MCP251X=m
+# CONFIG_CAN_PEAK_PCIEC is not set
CONFIG_CAN_PEAK_PCIEFD=m
CONFIG_CAN_PEAK_PCI=m
# CONFIG_CAN_PEAK_PCMCIA is not set
CONFIG_CAN_PEAK_USB=m
CONFIG_CAN_PLX_PCI=m
CONFIG_CAN_RAW=m
-# CONFIG_CAN_SJA1000_ISA is not set
-CONFIG_CAN_SJA1000=m
-CONFIG_CAN_SJA1000_PLATFORM=m
+# CONFIG_CAN_SJA1000 is not set
CONFIG_CAN_SLCAN=m
# CONFIG_CAN_SOFTING_CS is not set
CONFIG_CAN_SOFTING=m
@@ -1700,7 +1696,6 @@ CONFIG_ET131X=m
CONFIG_ETHERNET=y
CONFIG_ETHOC=m
CONFIG_ETHTOOL_NETLINK=y
-# CONFIG_ETM4X_IMPDEF_FEATURE is not set
# CONFIG_EUROTECH_WDT is not set
# CONFIG_EVM_ADD_XATTRS is not set
CONFIG_EVM_ATTR_FSUUID=y
@@ -4494,7 +4489,7 @@ CONFIG_PC8736x_GPIO=m
# CONFIG_PC87413_WDT is not set
CONFIG_PCCARD=y
CONFIG_PCENGINES_APU2=m
-CONFIG_PCH_CAN=m
+# CONFIG_PCH_CAN is not set
CONFIG_PCH_DMA=m
CONFIG_PCH_GBE=m
CONFIG_PCH_PHUB=m
@@ -5181,7 +5176,8 @@ CONFIG_RTC_INTF_DEV=y
CONFIG_RTC_INTF_PROC=y
CONFIG_RTC_INTF_SYSFS=y
CONFIG_RTC_NVMEM=y
-# CONFIG_RTC_SYSTOHC is not set
+CONFIG_RTC_SYSTOHC_DEVICE="rtc0"
+CONFIG_RTC_SYSTOHC=y
# CONFIG_RT_GROUP_SCHED is not set
CONFIG_RTL8180=m
CONFIG_RTL8187=m
@@ -6311,7 +6307,7 @@ CONFIG_STK3310=m
# CONFIG_STK8312 is not set
# CONFIG_STK8BA50 is not set
CONFIG_STM_DUMMY=m
-# CONFIG_STM is not set
+CONFIG_STM=m
CONFIG_STMMAC_ETH=m
# CONFIG_STMMAC_PCI is not set
# CONFIG_STMMAC_PLATFORM is not set