Merge branch 'armsoc/board' of git://github.com/hzhuang1/linux into next/boards

Browse source

A couple of board updates for PXA, from Haojian Zhuang.

* 'armsoc/board' of git://github.com/hzhuang1/linux:
  ARM: pxa: pxa27x.c: add dummy SA1100 rtc clock
  ARM: palmtreo: replace #if defined with IF_ENABLED
  ARM: palmtreo: add docg4 device initialization

Signed-off-by: Olof Johansson <olof@lixom.net>

...

This commit is contained in:

Olof Johansson 2013-01-27 22:36:59 -08:00

parent b297d9cd1a 495b21dc0e

commit 4b3c3be024

2 changed files with 34 additions and 2 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

35

arch/arm/mach-pxa/palmtreo.c

View file

1

arch/arm/mach-pxa/pxa27x.c

View file