diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2016-12-21 13:30:33 +0100 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2016-12-21 13:30:33 +0100 |
| commit | 6b9121d64ab2480f41622350c90ec5119738c67a (patch) | |
| tree | 8a6579fe317c71b074f0f521907e0731c08221e3 /baseconfig | |
| parent | a76e9e81d1ac7fb14551a839a62bbdf5967cee4c (diff) | |
| parent | dd50066e0b3e43d5b6c9b111ef31fc9ae5ca8d6d (diff) | |
| download | kernel-4.10.0-0.rc0.git6.1.vanilla.knurd.1.fc26.tar.gz kernel-4.10.0-0.rc0.git6.1.vanilla.knurd.1.fc26.tar.xz kernel-4.10.0-0.rc0.git6.1.vanilla.knurd.1.fc26.zip | |
Merge remote-tracking branch 'origin/master'kernel-4.10.0-0.rc0.git6.1.vanilla.knurd.1.fc26kernel-4.10.0-0.rc0.git6.1.vanilla.knurd.1.fc25kernel-4.10.0-0.rc0.git6.1.vanilla.knurd.1.fc24
Diffstat (limited to 'baseconfig')
| -rw-r--r-- | baseconfig/CONFIG_ARC_EMAC | 1 | ||||
| -rw-r--r-- | baseconfig/CONFIG_MFD_AC100 | 1 | ||||
| -rw-r--r-- | baseconfig/CONFIG_MFD_SUN4I_GPADC | 1 | ||||
| -rw-r--r-- | baseconfig/arm/CONFIG_MFD_AC100 | 1 | ||||
| -rw-r--r-- | baseconfig/arm/CONFIG_RTC_DRV_AC100 | 1 | ||||
| -rw-r--r-- | baseconfig/arm/CONFIG_SUNXI_RSB (renamed from baseconfig/arm/arm64/CONFIG_SUNXI_RSB) | 0 | ||||
| -rw-r--r-- | baseconfig/arm/arm64/CONFIG_PINCTRL_QDF2XXX | 2 | ||||
| -rw-r--r-- | baseconfig/arm/arm64/CONFIG_QCOM_HIDMA | 1 | ||||
| -rw-r--r-- | baseconfig/arm/arm64/CONFIG_QCOM_HIDMA_MGMT | 1 | ||||
| -rw-r--r-- | baseconfig/arm/armv7/CONFIG_SERIAL_STM32 | 1 | ||||
| -rw-r--r-- | baseconfig/arm/armv7/CONFIG_SUNXI_RSB | 1 |
11 files changed, 6 insertions, 5 deletions
diff --git a/baseconfig/CONFIG_ARC_EMAC b/baseconfig/CONFIG_ARC_EMAC deleted file mode 100644 index 7fa1bd3e7..000000000 --- a/baseconfig/CONFIG_ARC_EMAC +++ /dev/null @@ -1 +0,0 @@ -CONFIG_ARC_EMAC=m diff --git a/baseconfig/CONFIG_MFD_AC100 b/baseconfig/CONFIG_MFD_AC100 deleted file mode 100644 index efd609390..000000000 --- a/baseconfig/CONFIG_MFD_AC100 +++ /dev/null @@ -1 +0,0 @@ -# CONFIG_MFD_AC100 is not set diff --git a/baseconfig/CONFIG_MFD_SUN4I_GPADC b/baseconfig/CONFIG_MFD_SUN4I_GPADC new file mode 100644 index 000000000..d156cb188 --- /dev/null +++ b/baseconfig/CONFIG_MFD_SUN4I_GPADC @@ -0,0 +1 @@ +CONFIG_MFD_SUN4I_GPADC=m diff --git a/baseconfig/arm/CONFIG_MFD_AC100 b/baseconfig/arm/CONFIG_MFD_AC100 new file mode 100644 index 000000000..4decbd23b --- /dev/null +++ b/baseconfig/arm/CONFIG_MFD_AC100 @@ -0,0 +1 @@ +CONFIG_MFD_AC100=m diff --git a/baseconfig/arm/CONFIG_RTC_DRV_AC100 b/baseconfig/arm/CONFIG_RTC_DRV_AC100 new file mode 100644 index 000000000..3fbf952f3 --- /dev/null +++ b/baseconfig/arm/CONFIG_RTC_DRV_AC100 @@ -0,0 +1 @@ +CONFIG_RTC_DRV_AC100=m diff --git a/baseconfig/arm/arm64/CONFIG_SUNXI_RSB b/baseconfig/arm/CONFIG_SUNXI_RSB index 64558bbea..64558bbea 100644 --- a/baseconfig/arm/arm64/CONFIG_SUNXI_RSB +++ b/baseconfig/arm/CONFIG_SUNXI_RSB diff --git a/baseconfig/arm/arm64/CONFIG_PINCTRL_QDF2XXX b/baseconfig/arm/arm64/CONFIG_PINCTRL_QDF2XXX index 20e24a87a..e8dca820d 100644 --- a/baseconfig/arm/arm64/CONFIG_PINCTRL_QDF2XXX +++ b/baseconfig/arm/arm64/CONFIG_PINCTRL_QDF2XXX @@ -1 +1 @@ -# CONFIG_PINCTRL_QDF2XXX is not set +CONFIG_PINCTRL_QDF2XXX=y diff --git a/baseconfig/arm/arm64/CONFIG_QCOM_HIDMA b/baseconfig/arm/arm64/CONFIG_QCOM_HIDMA new file mode 100644 index 000000000..a5442952f --- /dev/null +++ b/baseconfig/arm/arm64/CONFIG_QCOM_HIDMA @@ -0,0 +1 @@ +CONFIG_QCOM_HIDMA=m diff --git a/baseconfig/arm/arm64/CONFIG_QCOM_HIDMA_MGMT b/baseconfig/arm/arm64/CONFIG_QCOM_HIDMA_MGMT new file mode 100644 index 000000000..8085b2ae4 --- /dev/null +++ b/baseconfig/arm/arm64/CONFIG_QCOM_HIDMA_MGMT @@ -0,0 +1 @@ +CONFIG_QCOM_HIDMA_MGMT=m diff --git a/baseconfig/arm/armv7/CONFIG_SERIAL_STM32 b/baseconfig/arm/armv7/CONFIG_SERIAL_STM32 deleted file mode 100644 index 7d5df429e..000000000 --- a/baseconfig/arm/armv7/CONFIG_SERIAL_STM32 +++ /dev/null @@ -1 +0,0 @@ -# CONFIG_SERIAL_STM32 is not set diff --git a/baseconfig/arm/armv7/CONFIG_SUNXI_RSB b/baseconfig/arm/armv7/CONFIG_SUNXI_RSB deleted file mode 100644 index 64558bbea..000000000 --- a/baseconfig/arm/armv7/CONFIG_SUNXI_RSB +++ /dev/null @@ -1 +0,0 @@ -CONFIG_SUNXI_RSB=m |