From 134af9d2ebe20b66fd8a9fac407470ffe1669efb Mon Sep 17 00:00:00 2001 From: Lee Jones Date: Wed, 8 May 2013 14:29:06 +0100 Subject: [PATCH] --- yaml --- r: 376231 b: refs/heads/master c: 7d2b64f9832d7cb971141703219b3dc495bb9332 h: refs/heads/master i: 376229: 3d8aae96ca7b9252b716c2ba014ea17da94e9c39 376227: aa131c6b650de2ca04d8e9e2506077c01bf69190 376223: 9201418c70f873dd3bed03b730a4af797111bdc3 v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-ux500/cpu-db8500.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index a1c9bf033c11..658a154b011d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ea63a11027103372f56bd2d9ee3c525be6edc9c1 +refs/heads/master: 7d2b64f9832d7cb971141703219b3dc495bb9332 diff --git a/trunk/arch/arm/mach-ux500/cpu-db8500.c b/trunk/arch/arm/mach-ux500/cpu-db8500.c index 8894327283e1..46cca52890bc 100644 --- a/trunk/arch/arm/mach-ux500/cpu-db8500.c +++ b/trunk/arch/arm/mach-ux500/cpu-db8500.c @@ -276,7 +276,7 @@ static struct of_dev_auxdata u8500_auxdata_lookup[] __initdata = { OF_DEV_AUXDATA("st,nomadik-i2c", 0x8012a000, "nmk-i2c.4", NULL), OF_DEV_AUXDATA("stericsson,db8500-prcmu", 0x80157000, "db8500-prcmu", &db8500_prcmu_pdata), - OF_DEV_AUXDATA("smsc,lan9115", 0x50000000, "smsc911x", NULL), + OF_DEV_AUXDATA("smsc,lan9115", 0x50000000, "smsc911x.0", NULL), /* Requires device name bindings. */ OF_DEV_AUXDATA("stericsson,nmk-pinctrl", U8500_PRCMU_BASE, "pinctrl-db8500", NULL),