ARM: S5PV310: Fix build error on GPIO map
authorKukjin Kim <kgene.kim@samsung.com>
Thu, 9 Sep 2010 12:57:29 +0000 (21:57 +0900)
committerKukjin Kim <kgene.kim@samsung.com>
Mon, 18 Oct 2010 23:02:57 +0000 (08:02 +0900)
commitfe0cdec8bad919fd91cd344123906a55f3857209
tree798d928f5173a8d631c8d95b08c33975b449fc4d
parent138a6c7f4ff56b9886cbb46656ac7f26f990cdb4
ARM: S5PV310: Fix build error on GPIO map

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>
arch/arm/mach-s5pv310/cpu.c
arch/arm/mach-s5pv310/include/mach/map.h