diff options
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/mfd/syscon.c | 2 | ||||
| -rw-r--r-- | drivers/net/phy/marvell.c | 3 | ||||
| -rw-r--r-- | drivers/serial/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/video/Kconfig | 1 |
4 files changed, 4 insertions, 4 deletions
diff --git a/drivers/mfd/syscon.c b/drivers/mfd/syscon.c index 295e210f6e..6ef30ce195 100644 --- a/drivers/mfd/syscon.c +++ b/drivers/mfd/syscon.c @@ -76,8 +76,6 @@ static void __iomem *syscon_node_to_base(struct device_node *np) return syscon->base; } -EXPORT_SYMBOL_GPL(syscon_node_to_regmap); - void __iomem *syscon_base_lookup_by_pdevname(const char *s) { diff --git a/drivers/net/phy/marvell.c b/drivers/net/phy/marvell.c index 6409f14ae2..9a963f6d5e 100644 --- a/drivers/net/phy/marvell.c +++ b/drivers/net/phy/marvell.c @@ -198,7 +198,8 @@ static int m88e1121_config_init(struct phy_device *phydev) if (ret < 0) return ret; - phy_write(phydev, MII_MARVELL_PHY_PAGE, MII_MARVELL_PHY_DEFAULT_PAGE); + ret = phy_write(phydev, MII_MARVELL_PHY_PAGE, + MII_MARVELL_PHY_DEFAULT_PAGE); if (ret < 0) return ret; diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig index 146bf1ec3c..b112d7ee04 100644 --- a/drivers/serial/Kconfig +++ b/drivers/serial/Kconfig @@ -2,7 +2,7 @@ menu "serial drivers" depends on !CONSOLE_NONE config DRIVER_SERIAL_ARM_DCC - depends on ARM + depends on ARM && !CPU_V8 bool "ARM Debug Communications Channel (DCC) serial driver" config SERIAL_AMBA_PL011 diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig index 2457bb9e45..8f31f5af74 100644 --- a/drivers/video/Kconfig +++ b/drivers/video/Kconfig @@ -130,6 +130,7 @@ config DRIVER_VIDEO_MTL017 config DRIVER_VIDEO_TC358767 bool "TC358767A Display Port encoder" select VIDEO_VPL + depends on DRIVER_VIDEO_EDID depends on I2C depends on OFTREE help |