Merge tag 'gpio-for-linus' of git://git.secretlab.ca/git/linux-2.6

[~andy/linux] / arch / m68k / Kconfig.cpu

diff --git a/arch/m68k/Kconfig.cpu b/arch/m68k/Kconfig.cpu
index 8a9c767125a4758b27e08f1488e27fa8b85ad258..2b53254ad994abad15b6f8e3a047aaecbd6a0694 100644 (file)
--- a/arch/m68k/Kconfig.cpu
+++ b/arch/m68k/Kconfig.cpu
@@ -7,7 +7,7 @@ choice
        help
          The Freescale (was Motorola) M68K family of processors implements
          the full 68000 processor instruction set.
-         The Freescale ColdFire family of processors is a modern derivitive
+         The Freescale ColdFire family of processors is a modern derivative
          of the 68000 processor family. They are mainly targeted at embedded
          applications, and are all System-On-Chip (SOC) devices, as opposed
          to stand alone CPUs. They implement a subset of the original 68000
@@ -24,6 +24,7 @@ config COLDFIRE
        bool "Coldfire CPU family support"
        select GENERIC_GPIO
        select ARCH_REQUIRE_GPIOLIB
+       select ARCH_HAVE_CUSTOM_GPIO_H
        select CPU_HAS_NO_BITFIELDS
        select CPU_HAS_NO_MULDIV64
        select GENERIC_CSUM