Merge branch 'fixes' of git://github.com/hzhuang1/linux into fixes

Browse source

* 'fixes' of git://github.com/hzhuang1/linux:
  ARM: pxa: fix build issue on stargate2
  ARM: pxa: fix build issue on cm-x300
  ARM: pxa: fix build failure for regulator consumer in em-x270.c
  ARM: pxa: fix regulator related build fail in magician_defconfig

...

This commit is contained in:

Olof Johansson 2012-03-29 20:36:18 -07:00

parent a92e7023ca 5616131daf

commit f00e9b1186

5 changed files with 6 additions and 11 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

1

arch/arm/mach-pxa/cm-x300.c

View file

10

arch/arm/mach-pxa/em-x270.c

View file

2

arch/arm/mach-pxa/hx4700.c

View file

2

arch/arm/mach-pxa/magician.c

View file

2

arch/arm/mach-pxa/stargate2.c

View file