diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2019-11-18 17:40:27 +0100 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2019-11-18 17:40:27 +0100 |
commit | 698074117f5e5d1f0d32a5581f21440c29b5f2d7 (patch) | |
tree | e156d10c59113648be1f8258a640e92a13e15fa2 /configs/fedora/generic | |
parent | 82b13176858df75c68fbf91fe8c953d5775aef7c (diff) | |
parent | eb5fbf2f84f557ecda2ea823a3e474e565060708 (diff) | |
download | kernel-698074117f5e5d1f0d32a5581f21440c29b5f2d7.tar.gz kernel-698074117f5e5d1f0d32a5581f21440c29b5f2d7.tar.xz kernel-698074117f5e5d1f0d32a5581f21440c29b5f2d7.zip |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.4.0-0.rc8.git0.1.vanilla.knurd.1.fc32kernel-5.4.0-0.rc8.git0.1.vanilla.knurd.1.fc31kernel-5.4.0-0.rc8.git0.1.vanilla.knurd.1.fc30kernel-5.4.0-0.rc8.git0.1.vanilla.knurd.1.fc29
Diffstat (limited to 'configs/fedora/generic')
-rw-r--r-- | configs/fedora/generic/CONFIG_USB_OHCI_HCD_SSB | 1 | ||||
-rw-r--r-- | configs/fedora/generic/arm/CONFIG_GPIO_STMPE (renamed from configs/fedora/generic/arm/armv7/armv7/CONFIG_GPIO_STMPE) | 0 | ||||
-rw-r--r-- | configs/fedora/generic/arm/CONFIG_KEYBOARD_STMPE (renamed from configs/fedora/generic/arm/armv7/armv7/CONFIG_KEYBOARD_STMPE) | 0 | ||||
-rw-r--r-- | configs/fedora/generic/arm/CONFIG_MFD_STMPE (renamed from configs/fedora/generic/arm/armv7/armv7/CONFIG_MFD_STMPE) | 0 | ||||
-rw-r--r-- | configs/fedora/generic/arm/CONFIG_PWM_STMPE (renamed from configs/fedora/generic/arm/armv7/armv7/CONFIG_PWM_STMPE) | 0 | ||||
-rw-r--r-- | configs/fedora/generic/arm/CONFIG_STMPE_ADC (renamed from configs/fedora/generic/arm/armv7/CONFIG_STMPE_ADC) | 0 | ||||
-rw-r--r-- | configs/fedora/generic/arm/CONFIG_STMPE_I2C (renamed from configs/fedora/generic/arm/armv7/armv7/CONFIG_STMPE_I2C) | 0 | ||||
-rw-r--r-- | configs/fedora/generic/arm/CONFIG_STMPE_SPI (renamed from configs/fedora/generic/arm/armv7/armv7/CONFIG_STMPE_SPI) | 0 | ||||
-rw-r--r-- | configs/fedora/generic/arm/CONFIG_TOUCHSCREEN_STMPE (renamed from configs/fedora/generic/arm/armv7/armv7/CONFIG_TOUCHSCREEN_STMPE) | 0 | ||||
-rw-r--r-- | configs/fedora/generic/arm/CONFIG_USB_EHCI_HCD | 1 | ||||
-rw-r--r-- | configs/fedora/generic/arm/CONFIG_USB_OHCI_HCD | 1 |
11 files changed, 3 insertions, 0 deletions
diff --git a/configs/fedora/generic/CONFIG_USB_OHCI_HCD_SSB b/configs/fedora/generic/CONFIG_USB_OHCI_HCD_SSB new file mode 100644 index 000000000..eb3e84ce6 --- /dev/null +++ b/configs/fedora/generic/CONFIG_USB_OHCI_HCD_SSB @@ -0,0 +1 @@ +# CONFIG_USB_OHCI_HCD_SSB is not set diff --git a/configs/fedora/generic/arm/armv7/armv7/CONFIG_GPIO_STMPE b/configs/fedora/generic/arm/CONFIG_GPIO_STMPE index 14d1708e2..14d1708e2 100644 --- a/configs/fedora/generic/arm/armv7/armv7/CONFIG_GPIO_STMPE +++ b/configs/fedora/generic/arm/CONFIG_GPIO_STMPE diff --git a/configs/fedora/generic/arm/armv7/armv7/CONFIG_KEYBOARD_STMPE b/configs/fedora/generic/arm/CONFIG_KEYBOARD_STMPE index ee2c5bbb8..ee2c5bbb8 100644 --- a/configs/fedora/generic/arm/armv7/armv7/CONFIG_KEYBOARD_STMPE +++ b/configs/fedora/generic/arm/CONFIG_KEYBOARD_STMPE diff --git a/configs/fedora/generic/arm/armv7/armv7/CONFIG_MFD_STMPE b/configs/fedora/generic/arm/CONFIG_MFD_STMPE index a076cddc3..a076cddc3 100644 --- a/configs/fedora/generic/arm/armv7/armv7/CONFIG_MFD_STMPE +++ b/configs/fedora/generic/arm/CONFIG_MFD_STMPE diff --git a/configs/fedora/generic/arm/armv7/armv7/CONFIG_PWM_STMPE b/configs/fedora/generic/arm/CONFIG_PWM_STMPE index 4c2b7c562..4c2b7c562 100644 --- a/configs/fedora/generic/arm/armv7/armv7/CONFIG_PWM_STMPE +++ b/configs/fedora/generic/arm/CONFIG_PWM_STMPE diff --git a/configs/fedora/generic/arm/armv7/CONFIG_STMPE_ADC b/configs/fedora/generic/arm/CONFIG_STMPE_ADC index 64ab9f554..64ab9f554 100644 --- a/configs/fedora/generic/arm/armv7/CONFIG_STMPE_ADC +++ b/configs/fedora/generic/arm/CONFIG_STMPE_ADC diff --git a/configs/fedora/generic/arm/armv7/armv7/CONFIG_STMPE_I2C b/configs/fedora/generic/arm/CONFIG_STMPE_I2C index ae0f5fdc0..ae0f5fdc0 100644 --- a/configs/fedora/generic/arm/armv7/armv7/CONFIG_STMPE_I2C +++ b/configs/fedora/generic/arm/CONFIG_STMPE_I2C diff --git a/configs/fedora/generic/arm/armv7/armv7/CONFIG_STMPE_SPI b/configs/fedora/generic/arm/CONFIG_STMPE_SPI index 7adaed89f..7adaed89f 100644 --- a/configs/fedora/generic/arm/armv7/armv7/CONFIG_STMPE_SPI +++ b/configs/fedora/generic/arm/CONFIG_STMPE_SPI diff --git a/configs/fedora/generic/arm/armv7/armv7/CONFIG_TOUCHSCREEN_STMPE b/configs/fedora/generic/arm/CONFIG_TOUCHSCREEN_STMPE index be64613d7..be64613d7 100644 --- a/configs/fedora/generic/arm/armv7/armv7/CONFIG_TOUCHSCREEN_STMPE +++ b/configs/fedora/generic/arm/CONFIG_TOUCHSCREEN_STMPE diff --git a/configs/fedora/generic/arm/CONFIG_USB_EHCI_HCD b/configs/fedora/generic/arm/CONFIG_USB_EHCI_HCD new file mode 100644 index 000000000..a2df656e0 --- /dev/null +++ b/configs/fedora/generic/arm/CONFIG_USB_EHCI_HCD @@ -0,0 +1 @@ +CONFIG_USB_EHCI_HCD=m diff --git a/configs/fedora/generic/arm/CONFIG_USB_OHCI_HCD b/configs/fedora/generic/arm/CONFIG_USB_OHCI_HCD new file mode 100644 index 000000000..b57227638 --- /dev/null +++ b/configs/fedora/generic/arm/CONFIG_USB_OHCI_HCD @@ -0,0 +1 @@ +CONFIG_USB_OHCI_HCD=m |