Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 376231
b: refs/heads/master
c: 7d2b64f
h: refs/heads/master
i:
  376229: 3d8aae9
  376227: aa131c6
  376223: 9201418
v: v3
  • Loading branch information
Lee Jones authored and Linus Walleij committed May 14, 2013
1 parent 4b68a5c commit 134af9d
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: ea63a11027103372f56bd2d9ee3c525be6edc9c1
refs/heads/master: 7d2b64f9832d7cb971141703219b3dc495bb9332
2 changes: 1 addition & 1 deletion trunk/arch/arm/mach-ux500/cpu-db8500.c
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand Down

0 comments on commit 134af9d

Please sign in to comment.