diff options
| author | Ben Hutchings <ben@decadent.org.uk> | 2019-03-15 01:45:58 +0000 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2019-03-15 01:45:58 +0000 |
| commit | 88d725750b9b4ea9c9228cae24f034ef78190880 (patch) | |
| tree | d88401c382b734d1a1d31d691a423a4ba8d95f3d | |
| parent | 44f134c2b9af9483531741c51f6089ffffad73f4 (diff) | |
| parent | fb17e155b92b0b074aa0bdcc1de7662020f0bf90 (diff) | |
| download | kernel_replicant_linux-88d725750b9b4ea9c9228cae24f034ef78190880.tar.gz kernel_replicant_linux-88d725750b9b4ea9c9228cae24f034ef78190880.tar.bz2 kernel_replicant_linux-88d725750b9b4ea9c9228cae24f034ef78190880.zip | |
Merge remote-tracking branch 'salsa/sid' into sid
| -rw-r--r-- | debian/changelog | 1 | ||||
| -rw-r--r-- | debian/config/arm64/config | 1 | ||||
| -rw-r--r-- | debian/config/armhf/config | 1 |
3 files changed, 0 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog index df7fd60d5fe3..732dd0f547f7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,7 +8,6 @@ linux (4.19.28-2) UNRELEASED; urgency=medium [ Vagrant Cascadian ] * [arm64] Enable DRM_SUN4I and DRM_SUN8I_DW_HDMI as modules. - * [arm64,armhf] Enable PHY_ROCKCHIP_INNO_HDMI as modules. * [arm64] Enable I2C_GPIO as a module. * [arm64] Enable MESON_EFUSE as a module. diff --git a/debian/config/arm64/config b/debian/config/arm64/config index 44e6c7b217b3..b6078b1f727b 100644 --- a/debian/config/arm64/config +++ b/debian/config/arm64/config @@ -804,7 +804,6 @@ CONFIG_PHY_QCOM_USB_HSIC=m ## file: drivers/phy/rockchip/Kconfig ## CONFIG_PHY_ROCKCHIP_EMMC=m -CONFIG_PHY_ROCKCHIP_INNO_HDMI=m CONFIG_PHY_ROCKCHIP_INNO_USB2=m CONFIG_PHY_ROCKCHIP_PCIE=m CONFIG_PHY_ROCKCHIP_TYPEC=m diff --git a/debian/config/armhf/config b/debian/config/armhf/config index f789e3b56198..a0bf4d89a9ac 100644 --- a/debian/config/armhf/config +++ b/debian/config/armhf/config @@ -916,7 +916,6 @@ CONFIG_PHY_SUN9I_USB=m ## file: drivers/phy/rockchip/Kconfig ## CONFIG_PHY_ROCKCHIP_DP=m -CONFIG_PHY_ROCKCHIP_INNO_HDMI=m CONFIG_PHY_ROCKCHIP_EMMC=m CONFIG_PHY_ROCKCHIP_USB=m |