ARM: S5PV310: Fix build error on GPIO map

Browse source

This patch fixes build error about GPIO address due to
conflict of commit 4d914705 and 19a2c065.

- commit 4d914705: Fix on GPIO base addresses
- commit 19a2c065: Moves initial map for merging S5P64X0

Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>

...

This commit is contained in:

Kukjin Kim 2010-09-09 21:57:29 +09:00

parent 138a6c7f4f

commit fe0cdec8ba

2 changed files with 1 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

2

arch/arm/mach-s5pv310/cpu.c

View file

1

arch/arm/mach-s5pv310/include/mach/map.h

View file