diff options
| author | Andrey Konovalov <andrey.konovalov@linaro.org> | 2013-05-08 22:31:23 +0400 |
|---|---|---|
| committer | Andrey Konovalov <andrey.konovalov@linaro.org> | 2013-05-08 22:31:23 +0400 |
| commit | b5ecfb82fe0b445ef873a600b845c7e2c6defcbb (patch) | |
| tree | aceeec33712877040ea67160bfb973c525479623 /arch/arm | |
| parent | 6ea7255270b484dd73385b2714765da942005b51 (diff) | |
| parent | 298590bf5b2b6d4f8e4fdb5e2c9c6bc27bf11dae (diff) | |
Automatically merging tracking-ste-tb-ethernet into merge-linux-linaro-core-tracking
Conflicting files:
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/mach-ux500/cpu-db8500.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-ux500/cpu-db8500.c b/arch/arm/mach-ux500/cpu-db8500.c index f1a581844372..5c6c2e633868 100644 --- a/arch/arm/mach-ux500/cpu-db8500.c +++ b/arch/arm/mach-ux500/cpu-db8500.c @@ -282,6 +282,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), /* Requires device name bindings. */ OF_DEV_AUXDATA("stericsson,nmk-pinctrl", U8500_PRCMU_BASE, "pinctrl-db8500", NULL), |