Merge branch 'for-2637/s3c24xx-all' of git://git.fluff.org/bjdooks/linux
* 'for-2637/s3c24xx-all' of git://git.fluff.org/bjdooks/linux: ARM: h1940: add UDA1380 to i2c devices list ARM: h1940: Fix backlight and LCD power functions ARM: S3C2440: fix boot failure introduced by recent changes in gpiolib ARM: S3C2440: various fixes in Kconfig file ARM: rx1950: Add UDA1380 to i2c devices list ARM: rx1950: Add LEDs support ARM: rx1950: Add battery device ARM: h1940: Implement mmc_power function ARM: h1940: Use gpiolib for latch access
Showing
- arch/arm/mach-s3c2410/h1940-bluetooth.c 10 additions, 3 deletionsarch/arm/mach-s3c2410/h1940-bluetooth.c
- arch/arm/mach-s3c2410/include/mach/h1940-latch.h 18 additions, 39 deletionsarch/arm/mach-s3c2410/include/mach/h1940-latch.h
- arch/arm/mach-s3c2410/mach-h1940.c 154 additions, 15 deletionsarch/arm/mach-s3c2410/mach-h1940.c
- arch/arm/mach-s3c2440/Kconfig 2 additions, 5 deletionsarch/arm/mach-s3c2440/Kconfig
- arch/arm/mach-s3c2440/mach-rx1950.c 212 additions, 6 deletionsarch/arm/mach-s3c2440/mach-rx1950.c
- arch/arm/plat-s3c24xx/Kconfig 1 addition, 0 deletionsarch/arm/plat-s3c24xx/Kconfig
- arch/arm/plat-s3c24xx/gpiolib.c 2 additions, 0 deletionsarch/arm/plat-s3c24xx/gpiolib.c
Loading
Please register or sign in to comment