summaryrefslogtreecommitdiffstats
path: root/drivers/of
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2012-03-16 20:25:17 +0000
committerArnd Bergmann <arnd@arndb.de>2012-03-16 20:25:17 +0000
commita94c7b0a8f31a8bcf3b136d469f7eb6b6b57bb78 (patch)
treecac33ce0abaaeb56b6e08a396cb7ff4e3e3b8f61 /drivers/of
parentd4ef467aea0fdcd5e75a4bbfaf97e579bbe532f3 (diff)
parent9652e8bd16e73f7a34cabf1ab114aaa5c97db660 (diff)
Merge branch 'spear/dt' into next/dt2
* spear/dt: ARM: SPEAr600: Add device-tree support to SPEAr600 boards (update to v3.3-rc7) Conflicts: arch/arm/mach-spear6xx/spear6xx.c arch/arm/mach-vexpress/Kconfig The conflicts are between the previous contents of the next/dt2 branch and upstream changes from v3.3-rc7. Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'drivers/of')
-rw-r--r--drivers/of/fdt.c1
-rw-r--r--drivers/of/of_mdio.c2
2 files changed, 1 insertions, 2 deletions
diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c
index ea2bd1be264..91a375fb6ae 100644
--- a/drivers/of/fdt.c
+++ b/drivers/of/fdt.c
@@ -23,7 +23,6 @@
#include <asm/machdep.h>
#endif /* CONFIG_PPC */
-#include <asm/setup.h>
#include <asm/page.h>
char *of_fdt_get_string(struct boot_param_header *blob, u32 offset)
diff --git a/drivers/of/of_mdio.c b/drivers/of/of_mdio.c
index 980c079e444..483c0adcad8 100644
--- a/drivers/of/of_mdio.c
+++ b/drivers/of/of_mdio.c
@@ -182,7 +182,7 @@ struct phy_device *of_phy_connect_fixed_link(struct net_device *dev,
if (!phy_id || sz < sizeof(*phy_id))
return NULL;
- sprintf(bus_id, PHY_ID_FMT, "0", be32_to_cpu(phy_id[0]));
+ sprintf(bus_id, PHY_ID_FMT, "fixed-0", be32_to_cpu(phy_id[0]));
phy = phy_connect(dev, bus_id, hndlr, 0, iface);
return IS_ERR(phy) ? NULL : phy;