diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2018-09-17 18:12:15 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2018-09-17 18:12:15 +0200 |
| commit | 20afbe1cdd218f149a773c01945893c353fa2c60 (patch) | |
| tree | 0e0526ab848c717a7971728347f62a81d1ca9a1b /configs/fedora/generic/arm | |
| parent | 93bf93308b5aad49a6575406966b3ab2047e14d3 (diff) | |
| parent | a54055adb14a40ada848c9ef6677cecbc58939e2 (diff) | |
| download | kernel-20afbe1cdd218f149a773c01945893c353fa2c60.tar.gz kernel-20afbe1cdd218f149a773c01945893c353fa2c60.tar.xz kernel-20afbe1cdd218f149a773c01945893c353fa2c60.zip | |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-4.19.0-0.rc4.git0.1.vanilla.knurd.1.fc30kernel-4.19.0-0.rc4.git0.1.vanilla.knurd.1.fc29kernel-4.19.0-0.rc4.git0.1.vanilla.knurd.1.fc28kernel-4.19.0-0.rc4.git0.1.vanilla.knurd.1.fc27
Diffstat (limited to 'configs/fedora/generic/arm')
13 files changed, 3 insertions, 5 deletions
diff --git a/configs/fedora/generic/arm/CONFIG_BACKLIGHT_PWM b/configs/fedora/generic/arm/CONFIG_BACKLIGHT_PWM deleted file mode 100644 index 44737e214..000000000 --- a/configs/fedora/generic/arm/CONFIG_BACKLIGHT_PWM +++ /dev/null @@ -1 +0,0 @@ -CONFIG_BACKLIGHT_PWM=m diff --git a/configs/fedora/generic/arm/armv7/CONFIG_BATTERY_SBS b/configs/fedora/generic/arm/CONFIG_BATTERY_SBS index b364b07f0..b364b07f0 100644 --- a/configs/fedora/generic/arm/armv7/CONFIG_BATTERY_SBS +++ b/configs/fedora/generic/arm/CONFIG_BATTERY_SBS diff --git a/configs/fedora/generic/arm/armv7/CONFIG_CHARGER_BQ24735 b/configs/fedora/generic/arm/CONFIG_CHARGER_BQ24735 index 658d71eb4..658d71eb4 100644 --- a/configs/fedora/generic/arm/armv7/CONFIG_CHARGER_BQ24735 +++ b/configs/fedora/generic/arm/CONFIG_CHARGER_BQ24735 diff --git a/configs/fedora/generic/arm/CONFIG_EFI_ARMSTUB_DTB_LOADER b/configs/fedora/generic/arm/CONFIG_EFI_ARMSTUB_DTB_LOADER index 2066ba266..d729d29d3 100644 --- a/configs/fedora/generic/arm/CONFIG_EFI_ARMSTUB_DTB_LOADER +++ b/configs/fedora/generic/arm/CONFIG_EFI_ARMSTUB_DTB_LOADER @@ -1 +1 @@ -# CONFIG_EFI_ARMSTUB_DTB_LOADER is not set +CONFIG_EFI_ARMSTUB_DTB_LOADER=y diff --git a/configs/fedora/generic/arm/armv7/CONFIG_MFD_AS3722 b/configs/fedora/generic/arm/CONFIG_MFD_AS3722 index 6aa06bd4b..6aa06bd4b 100644 --- a/configs/fedora/generic/arm/armv7/CONFIG_MFD_AS3722 +++ b/configs/fedora/generic/arm/CONFIG_MFD_AS3722 diff --git a/configs/fedora/generic/arm/CONFIG_PINCTRL_AS3722 b/configs/fedora/generic/arm/CONFIG_PINCTRL_AS3722 new file mode 100644 index 000000000..399c5bf8e --- /dev/null +++ b/configs/fedora/generic/arm/CONFIG_PINCTRL_AS3722 @@ -0,0 +1 @@ +CONFIG_PINCTRL_AS3722=m diff --git a/configs/fedora/generic/arm/armv7/CONFIG_POWER_RESET_AS3722 b/configs/fedora/generic/arm/CONFIG_POWER_RESET_AS3722 index d73cd6d68..d73cd6d68 100644 --- a/configs/fedora/generic/arm/armv7/CONFIG_POWER_RESET_AS3722 +++ b/configs/fedora/generic/arm/CONFIG_POWER_RESET_AS3722 diff --git a/configs/fedora/generic/arm/armv7/CONFIG_REGULATOR_AS3722 b/configs/fedora/generic/arm/CONFIG_REGULATOR_AS3722 index 8eececb2a..8eececb2a 100644 --- a/configs/fedora/generic/arm/armv7/CONFIG_REGULATOR_AS3722 +++ b/configs/fedora/generic/arm/CONFIG_REGULATOR_AS3722 diff --git a/configs/fedora/generic/arm/CONFIG_RTC_DRV_AS3722 b/configs/fedora/generic/arm/CONFIG_RTC_DRV_AS3722 new file mode 100644 index 000000000..2430f5b3b --- /dev/null +++ b/configs/fedora/generic/arm/CONFIG_RTC_DRV_AS3722 @@ -0,0 +1 @@ +CONFIG_RTC_DRV_AS3722=m diff --git a/configs/fedora/generic/arm/armv7/CONFIG_TCG_TIS_I2C_INFINEON b/configs/fedora/generic/arm/CONFIG_TCG_TIS_I2C_INFINEON index c4409f95b..c4409f95b 100644 --- a/configs/fedora/generic/arm/armv7/CONFIG_TCG_TIS_I2C_INFINEON +++ b/configs/fedora/generic/arm/CONFIG_TCG_TIS_I2C_INFINEON diff --git a/configs/fedora/generic/arm/armv7/CONFIG_PINCTRL_AS3722 b/configs/fedora/generic/arm/armv7/CONFIG_PINCTRL_AS3722 deleted file mode 100644 index c620f49f9..000000000 --- a/configs/fedora/generic/arm/armv7/CONFIG_PINCTRL_AS3722 +++ /dev/null @@ -1 +0,0 @@ -CONFIG_PINCTRL_AS3722=y diff --git a/configs/fedora/generic/arm/armv7/CONFIG_RTC_DRV_AS3722 b/configs/fedora/generic/arm/armv7/CONFIG_RTC_DRV_AS3722 deleted file mode 100644 index 2b582bcab..000000000 --- a/configs/fedora/generic/arm/armv7/CONFIG_RTC_DRV_AS3722 +++ /dev/null @@ -1 +0,0 @@ -CONFIG_RTC_DRV_AS3722=y diff --git a/configs/fedora/generic/arm/armv7/armv7/CONFIG_MACH_OMAP_LDP b/configs/fedora/generic/arm/armv7/armv7/CONFIG_MACH_OMAP_LDP deleted file mode 100644 index e35637633..000000000 --- a/configs/fedora/generic/arm/armv7/armv7/CONFIG_MACH_OMAP_LDP +++ /dev/null @@ -1 +0,0 @@ -# CONFIG_MACH_OMAP_LDP is not set |