From: Kukjin Kim <kgene.kim@samsung.com>
Date: Thu, 9 Sep 2010 12:57:29 +0000 (+0900)
Subject: ARM: S5PV310: Fix build error on GPIO map
X-Git-Tag: v2.6.37-rc1~184^2~5^2~1^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fe0cdec8bad919fd91cd344123906a55f3857209;p=pandora-kernel.git

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>
---

Reading git-diff-tree failed