Merge commit 'a849088aa1' from rmk/fixes into cleanup/io-pci

As Stephen Rothwell reports, a849088aa155 ("ARM: Fix ioremap() of
address zero") from the arm-current tree and commit c2794437091a ("ARM:
Add fixed PCI i/o mapping") from the arm-soc tree conflict in
a nontrivial way in arch/arm/mm/mmu.c.

Rob Herring explains:
The PCI i/o reserved area has a dummy physical address of 0 and
needs to be skipped by ioremap searches. So we don't set
VM_ARM_STATIC_MAPPING to prevent matches by ioremap. The vm_struct
settings don't really matter when we do the real mapping of the
i/o space.

Since commit a849088aa155 is at the start of the fixes branch
in the arm tree, we can merge it into the branch that contains
the other ioremap changes.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Cc: Rob Herring <rob.herring@calxeda.com>
Cc: Russell King <rmk+kernel@arm.linux.org.uk>

1 files changed, 1 insertions, 6 deletions

diff --git a/arch/arm/mach-mxs/Kconfig b/arch/arm/mach-mxs/Kconfig
index 91cf0625819c..9a8bbda195b2 100644
--- a/arch/arm/mach-mxs/Kconfig
+++ b/arch/arm/mach-mxs/Kconfig
@@ -2,9 +2,6 @@ if ARCH_MXS
 
 source "arch/arm/mach-mxs/devices/Kconfig"
 
-config MXS_OCOTP
-        bool
-
 config SOC_IMX23
         bool
         select ARM_AMBA
@@ -16,6 +13,7 @@ config SOC_IMX28
         bool
         select ARM_AMBA
         select CPU_ARM926T
+        select HAVE_CAN_FLEXCAN if CAN
         select HAVE_PWM
         select PINCTRL_IMX28
 
@@ -65,7 +63,6 @@ config MACH_MX28EVK
         select MXS_HAVE_PLATFORM_MXS_SAIF
         select MXS_HAVE_PLATFORM_MXS_I2C
         select MXS_HAVE_PLATFORM_RTC_STMP3XXX
-        select MXS_OCOTP
         help
           Include support for MX28EVK platform. This includes specific
           configurations for the board and its peripherals.
@@ -93,7 +90,6 @@ config MODULE_M28
         select MXS_HAVE_PLATFORM_MXS_I2C
         select MXS_HAVE_PLATFORM_MXS_MMC
         select MXS_HAVE_PLATFORM_MXSFB
-        select MXS_OCOTP
 
 config MODULE_APX4
         bool
@@ -105,7 +101,6 @@ config MODULE_APX4
         select MXS_HAVE_PLATFORM_MXS_I2C
         select MXS_HAVE_PLATFORM_MXS_MMC
         select MXS_HAVE_PLATFORM_MXS_SAIF
-        select MXS_OCOTP
 
 config MACH_TX28
         bool "Ka-Ro TX28 module"