Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:
  m68knommu: export clk_* symbols in clk.c
  m68knommu: Split the .init section into INIT_TEXT_SECTION and INIT_DATA_SECTION.
  m68knommu: Move __init_end out of the .init section.
  m68knommu: Move __init_begin out of the .init section.
  m68knommu: Use more macros inside the .init section.
  m68knommu: Use INIT_TASK_DATA and CACHELINE_ALIGNED_DATA.
  m68knommu: Make THREAD_SIZE available to assembly files.
  m68knommu: Don't hardcode the value of PAGE_SIZE in the linker script.
  m68knommu: rename BSS define in linker script
  m68knommu: add a task_pt_regs() macro
  m68knommu: define arch_has_single_step() and friends
  m68knommu: add uboot commandline argument passing support
  m68knommu: Coldfire GPIO corrections
  m68knommu: move mcf_remove to .devexit.text

Fixed up (?) conflict in arch/m68k/include/asm/ptrace.h

1 files changed, 4 insertions, 2 deletions

diff --git a/arch/m68knommu/platform/527x/gpio.c b/arch/m68knommu/platform/527x/gpio.c
index 1028142851ac..0b56e19db0f8 100644
--- a/arch/m68knommu/platform/527x/gpio.c
+++ b/arch/m68knommu/platform/527x/gpio.c
@@ -31,7 +31,8 @@ static struct mcf_gpio_chip mcf_gpio_chips[] = {
                         .direction_output       = mcf_gpio_direction_output,
                         .get                    = mcf_gpio_get_value,
                         .set                    = mcf_gpio_set_value,
-                        .ngpio                  = 8,
+                        .base                   = 1,
+                        .ngpio                  = 7,
                 },
                 .pddr                           = MCFEPORT_EPDDR,
                 .podr                           = MCFEPORT_EPDR,
@@ -263,7 +264,8 @@ static struct mcf_gpio_chip mcf_gpio_chips[] = {
                         .direction_output       = mcf_gpio_direction_output,
                         .get                    = mcf_gpio_get_value,
                         .set                    = mcf_gpio_set_value,
-                        .ngpio                  = 8,
+                        .base                   = 1,
+                        .ngpio                  = 7,
                 },
                 .pddr                           = MCFEPORT_EPDDR,
                 .podr                           = MCFEPORT_EPDR,