• Arnd Bergmann's avatar
    Merge branch 'cleanup/gpio-header-removal' into next/soc · dffd7e35
    Arnd Bergmann authored
    * cleanup/gpio-header-removal:
      ARM: delete old reference to ARM_GPIOLIB_COMPLEX
      ARM: kill CONFIG_NEED_MACH_GPIO_H
      ARM: mach-s5p: get rid of all <mach/gpio.h> headers
      ARM: s5p: cut the custom ARCH_NR_GPIOS definition
    
    This resolves a massive amount of conflicts between the
    mach/gpio.h removal and the s5p platform removal.
    
    Almost all changes are trivial, as both sides remove
    stuff.
    
    Conflicts:
    	arch/arm/Kconfig
    	arch/arm/mach-s5p64x0/common.c
    	arch/arm/mach-s5p64x0/dev-audio.c
    	arch/arm/mach-s5p64x0/include/mach/gpio-samsung.h
    	arch/arm/mach-s5p64x0/mach-smdk6440.c
    	arch/arm/mach-s5p64x0/mach-smdk6450.c
    	arch/arm/mach-s5p64x0/setup-fb-24bpp.c
    	arch/arm/mach-s5p64x0/setup-i2c0.c
    	arch/arm/mach-s5p64x0/setup-i2c1.c
    	arch/arm/mach-s5p64x0/setup-sdhci-gpio.c
    	arch/arm/mach-s5p64x0/setup-spi.c
    	arch/arm/mach-s5pc100/dev-audio.c
    	arch/arm/mach-s5pc100/include/mach/gpio-samsung.h
    	arch/arm/mach-s5pc100/mach-smdkc100.c
    	arch/arm/mach-s5pc100/setup-fb-24bpp.c
    	arch/arm/mach-s5pc100/setup-i2c0.c
    	arch/arm/mach-s5pc100/setup-i2c1.c
    	arch/arm/mach-s5pc100/setup-ide.c
    	arch/arm/mach-s5pc100/setup-keypad.c
    	arch/arm/mach-s5pc100/setup-sdhci-gpio.c
    	arch/arm/mach-s5pc100/setup-spi.c
    	arch/arm/mach-s5pv210/dev-audio.c
    	arch/arm/mach-s5pv210/include/mach/gpio-samsung.h
    	arch/arm/mach-s5pv210/mach-aquila.c
    	arch/arm/mach-s5pv210/mach-goni.c
    	arch/arm/mach-s5pv210/mach-smdkv210.c
    	arch/arm/mach-s5pv210/setup-fb-24bpp.c
    	arch/arm/mach-s5pv210/setup-fimc.c
    	arch/arm/mach-s5pv210/setup-i2c0.c
    	arch/arm/mach-s5pv210/setup-i2c1.c
    	arch/arm/mach-s5pv210/setup-i2c2.c
    	arch/arm/mach-s5pv210/setup-ide.c
    	arch/arm/mach-s5pv210/setup-keypad.c
    	arch/arm/mach-s5pv210/setup-sdhci-gpio.c
    	arch/arm/mach-s5pv210/setup-spi.c
    	arch/arm/plat-samsung/Kconfig
    	arch/arm/plat-samsung/s5p-irq-eint.c
    Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
    dffd7e35
pm-gpio.c 9.7 KB