diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2017-12-05 07:26:42 +0100 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2017-12-05 07:26:42 +0100 |
| commit | b01869894b09ef451f7af86c0e24d81265879c80 (patch) | |
| tree | 087041d2da55faddd55f6f8e915d8aad02a5c5f6 /configs | |
| parent | 043e648f56fd67cee45abc9e032151e4ff63fc47 (diff) | |
| parent | afeb9a1070413d335cc42588d867f36515b9e25e (diff) | |
| download | kernel-4.15.0-0.rc2.git0.1.vanilla.knurd.1.fc26.tar.gz kernel-4.15.0-0.rc2.git0.1.vanilla.knurd.1.fc26.tar.xz kernel-4.15.0-0.rc2.git0.1.vanilla.knurd.1.fc26.zip | |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-4.15.0-0.rc2.git0.1.vanilla.knurd.1.fc28kernel-4.15.0-0.rc2.git0.1.vanilla.knurd.1.fc27kernel-4.15.0-0.rc2.git0.1.vanilla.knurd.1.fc26kernel-4.15.0-0.rc2.git0.1.vanilla.knurd.1.fc25
Diffstat (limited to 'configs')
| -rw-r--r-- | configs/base-generic/arm/CONFIG_DRM_SUN4I_HDMI (renamed from configs/base-generic/arm/armv7/CONFIG_DRM_SUN4I_HDMI) | 0 | ||||
| -rw-r--r-- | configs/base-generic/arm/CONFIG_DRM_SUN4I_HDMI_CEC | 1 | ||||
| -rw-r--r-- | configs/base-generic/arm/CONFIG_SIMPLE_PM_BUS | 1 | ||||
| -rw-r--r-- | configs/base-generic/arm/armv7/CONFIG_DRM_SUN4I_HDMI_CEC | 1 |
4 files changed, 2 insertions, 1 deletions
diff --git a/configs/base-generic/arm/armv7/CONFIG_DRM_SUN4I_HDMI b/configs/base-generic/arm/CONFIG_DRM_SUN4I_HDMI index cda1f60f8..cda1f60f8 100644 --- a/configs/base-generic/arm/armv7/CONFIG_DRM_SUN4I_HDMI +++ b/configs/base-generic/arm/CONFIG_DRM_SUN4I_HDMI diff --git a/configs/base-generic/arm/CONFIG_DRM_SUN4I_HDMI_CEC b/configs/base-generic/arm/CONFIG_DRM_SUN4I_HDMI_CEC new file mode 100644 index 000000000..146d9409f --- /dev/null +++ b/configs/base-generic/arm/CONFIG_DRM_SUN4I_HDMI_CEC @@ -0,0 +1 @@ +CONFIG_DRM_SUN4I_HDMI_CEC=y diff --git a/configs/base-generic/arm/CONFIG_SIMPLE_PM_BUS b/configs/base-generic/arm/CONFIG_SIMPLE_PM_BUS new file mode 100644 index 000000000..3cc21476a --- /dev/null +++ b/configs/base-generic/arm/CONFIG_SIMPLE_PM_BUS @@ -0,0 +1 @@ +CONFIG_SIMPLE_PM_BUS=y diff --git a/configs/base-generic/arm/armv7/CONFIG_DRM_SUN4I_HDMI_CEC b/configs/base-generic/arm/armv7/CONFIG_DRM_SUN4I_HDMI_CEC deleted file mode 100644 index 8ba73409c..000000000 --- a/configs/base-generic/arm/armv7/CONFIG_DRM_SUN4I_HDMI_CEC +++ /dev/null @@ -1 +0,0 @@ -# CONFIG_DRM_SUN4I_HDMI_CEC is not set |