diff options
| author | Andrey Konovalov <andrey.konovalov@linaro.org> | 2013-03-21 00:17:52 +0400 |
|---|---|---|
| committer | Andrey Konovalov <andrey.konovalov@linaro.org> | 2013-03-21 00:17:52 +0400 |
| commit | 4a5fe7cb41dec994b104cf6d5d5236c90ba21f2d (patch) | |
| tree | b20861a4d651cd4532d5d126985b870643a1c7b3 /arch/arm | |
| parent | 7688c8bcfb6f05e64f9386ae5b769ccdf50035fb (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 19235cf7bbe3..1c7f794ad7d1 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), |