mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-01 14:44:12 +00:00
Code Issues Releases Wiki Activity

Merge branch 's3c-moves2' of git://aeryn.fluff.org.uk/bjdooks/linux into devel

Browse source
This commit is contained in:
Russell King 2008-11-29 19:35:07 +00:00 committed by Russell King
commit fba670013d
39 changed files with 41 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
arch/arm/mach-s3c2410/dma.c
View file

@ -24,12 +24,12 @@
#include <plat/regs-serial.h>
#include <mach/regs-gpio.h>
#include <asm/plat-s3c/regs-ac97.h>
#include <plat/regs-ac97.h>
#include <mach/regs-mem.h>
#include <mach/regs-lcd.h>
#include <mach/regs-sdi.h>
#include <asm/plat-s3c24xx/regs-iis.h>
#include <asm/plat-s3c24xx/regs-spi.h>
#include <plat/regs-spi.h>
static struct s3c24xx_dma_map __initdata s3c2410_dma_mappings[] = {
[DMACH_XD0] = {

2
arch/arm/mach-s3c2410/include/mach/system-reset.h
View file

@ -13,7 +13,7 @@
#include <mach/hardware.h>
#include <linux/io.h>
#include <asm/plat-s3c/regs-watchdog.h>
#include <plat/regs-watchdog.h>
#include <mach/regs-clock.h>
#include <linux/clk.h>

4
arch/arm/mach-s3c2410/mach-bast.c
View file

@ -44,8 +44,8 @@
#include <mach/regs-mem.h>
#include <mach/regs-lcd.h>
#include <asm/plat-s3c/nand.h>
#include <asm/plat-s3c/iic.h>
#include <plat/nand.h>
#include <plat/iic.h>
#include <mach/fb.h>
#include <linux/mtd/mtd.h>

2
arch/arm/mach-s3c2410/mach-h1940.c
View file

@ -38,7 +38,7 @@
#include <mach/h1940.h>
#include <mach/h1940-latch.h>
#include <mach/fb.h>
#include <asm/plat-s3c24xx/udc.h>
#include <plat/udc.h>
#include <plat/clock.h>
#include <plat/devs.h>

4
arch/arm/mach-s3c2410/mach-n30.c
View file

@ -40,14 +40,14 @@
#include <asm/mach/irq.h>
#include <asm/mach/map.h>
#include <asm/plat-s3c/iic.h>
#include <plat/iic.h>
#include <plat/regs-serial.h>
#include <plat/clock.h>
#include <plat/cpu.h>
#include <plat/devs.h>
#include <plat/s3c2410.h>
#include <asm/plat-s3c24xx/udc.h>
#include <plat/udc.h>
static struct map_desc n30_iodesc[] __initdata = {
/* nothing here yet */

4
arch/arm/mach-s3c2410/mach-qt2410.c
View file

@ -50,8 +50,8 @@
#include <mach/leds-gpio.h>
#include <plat/regs-serial.h>
#include <mach/fb.h>
#include <asm/plat-s3c/nand.h>
#include <asm/plat-s3c24xx/udc.h>
#include <plat/nand.h>
#include <plat/udc.h>
#include <mach/spi.h>
#include <mach/spi-gpio.h>

4
arch/arm/mach-s3c2412/dma.c
View file

@ -25,13 +25,13 @@
#include <plat/regs-serial.h>
#include <mach/regs-gpio.h>
#include <asm/plat-s3c/regs-ac97.h>
#include <plat/regs-ac97.h>
#include <mach/regs-mem.h>
#include <mach/regs-lcd.h>
#include <mach/regs-sdi.h>
#include <asm/plat-s3c24xx/regs-s3c2412-iis.h>
#include <asm/plat-s3c24xx/regs-iis.h>
#include <asm/plat-s3c24xx/regs-spi.h>
#include <plat/regs-spi.h>
#define MAP(x) { (x)| DMA_CH_VALID, (x)| DMA_CH_VALID, (x)| DMA_CH_VALID, (x)| DMA_CH_VALID }

6
arch/arm/mach-s3c2412/mach-jive.c
View file

@ -31,8 +31,8 @@
#include <asm/mach/irq.h>
#include <plat/regs-serial.h>
#include <asm/plat-s3c/nand.h>
#include <asm/plat-s3c/iic.h>
#include <plat/nand.h>
#include <plat/iic.h>
#include <mach/regs-power.h>
#include <mach/regs-gpio.h>
@ -52,7 +52,7 @@
#include <plat/devs.h>
#include <plat/cpu.h>
#include <plat/pm.h>
#include <asm/plat-s3c24xx/udc.h>
#include <plat/udc.h>
static struct map_desc jive_iodesc[] __initdata = {
};

2
arch/arm/mach-s3c2412/mach-smdk2413.c
View file

@ -37,7 +37,7 @@
#include <mach/regs-lcd.h>
#include <mach/idle.h>
#include <asm/plat-s3c24xx/udc.h>
#include <plat/udc.h>
#include <mach/fb.h>
#include <plat/s3c2410.h>

2
arch/arm/mach-s3c2412/mach-vstms.c
View file

@ -39,7 +39,7 @@
#include <mach/idle.h>
#include <mach/fb.h>
#include <asm/plat-s3c/nand.h>
#include <plat/nand.h>
#include <plat/s3c2410.h>
#include <plat/s3c2412.h>

2
arch/arm/mach-s3c2412/s3c2412.c
View file

@ -39,7 +39,7 @@
#include <mach/regs-gpio.h>
#include <mach/regs-gpioj.h>
#include <mach/regs-dsc.h>
#include <asm/plat-s3c24xx/regs-spi.h>
#include <plat/regs-spi.h>
#include <mach/regs-s3c2412.h>
#include <plat/s3c2412.h>

4
arch/arm/mach-s3c2440/dma.c
View file

@ -24,12 +24,12 @@
#include <plat/regs-serial.h>
#include <mach/regs-gpio.h>
#include <asm/plat-s3c/regs-ac97.h>
#include <plat/regs-ac97.h>
#include <mach/regs-mem.h>
#include <mach/regs-lcd.h>
#include <mach/regs-sdi.h>
#include <asm/plat-s3c24xx/regs-iis.h>
#include <asm/plat-s3c24xx/regs-spi.h>
#include <plat/regs-spi.h>
static struct s3c24xx_dma_map __initdata s3c2440_dma_mappings[] = {
[DMACH_XD0] = {

2
arch/arm/mach-s3c2440/mach-anubis.c
View file

@ -39,7 +39,7 @@
#include <mach/regs-gpio.h>
#include <mach/regs-mem.h>
#include <mach/regs-lcd.h>
#include <asm/plat-s3c/nand.h>
#include <plat/nand.h>
#include <linux/mtd/mtd.h>
#include <linux/mtd/nand.h>

2
arch/arm/mach-s3c2440/mach-at2440evb.c
View file

@ -35,7 +35,7 @@
#include <mach/regs-gpio.h>
#include <mach/regs-mem.h>
#include <mach/regs-lcd.h>
#include <asm/plat-s3c/nand.h>
#include <plat/nand.h>
#include <linux/mtd/mtd.h>
#include <linux/mtd/nand.h>

2
arch/arm/mach-s3c2440/mach-osiris.c
View file

@ -37,7 +37,7 @@
#include <mach/regs-gpio.h>
#include <mach/regs-mem.h>
#include <mach/regs-lcd.h>
#include <asm/plat-s3c/nand.h>
#include <plat/nand.h>
#include <linux/mtd/mtd.h>
#include <linux/mtd/nand.h>

2
arch/arm/mach-s3c2440/mach-rx3715.c
View file

@ -42,7 +42,7 @@
#include <mach/regs-lcd.h>
#include <mach/h1940.h>
#include <asm/plat-s3c/nand.h>
#include <plat/nand.h>
#include <mach/fb.h>
#include <plat/clock.h>

4
arch/arm/mach-s3c2443/dma.c
View file

@ -25,12 +25,12 @@
#include <plat/regs-serial.h>
#include <mach/regs-gpio.h>
#include <asm/plat-s3c/regs-ac97.h>
#include <plat/regs-ac97.h>
#include <mach/regs-mem.h>
#include <mach/regs-lcd.h>
#include <mach/regs-sdi.h>
#include <asm/plat-s3c24xx/regs-iis.h>
#include <asm/plat-s3c24xx/regs-spi.h>
#include <plat/regs-spi.h>
#define MAP(x) { \
[0] = (x) | DMA_CH_VALID, \

0
include/asm-arm/plat-s3c/iic.h → arch/arm/plat-s3c/include/plat/iic.h
View file

0
include/asm-arm/plat-s3c/nand.h → arch/arm/plat-s3c/include/plat/nand.h
View file

0
include/asm-arm/plat-s3c/regs-ac97.h → arch/arm/plat-s3c/include/plat/regs-ac97.h
View file

0
include/asm-arm/plat-s3c/regs-iic.h → arch/arm/plat-s3c/include/plat/regs-iic.h
View file

0
include/asm-arm/plat-s3c/regs-nand.h → arch/arm/plat-s3c/include/plat/regs-nand.h
View file

0
include/asm-arm/plat-s3c/regs-rtc.h → arch/arm/plat-s3c/include/plat/regs-rtc.h
View file

0
include/asm-arm/plat-s3c/regs-watchdog.h → arch/arm/plat-s3c/include/plat/regs-watchdog.h
View file

2
arch/arm/plat-s3c/include/plat/uncompress.h
View file

@ -28,7 +28,7 @@ static void arch_detect_cpu(void);
/* defines for UART registers */
#include <plat/regs-serial.h>
#include <asm/plat-s3c/regs-watchdog.h>
#include <plat/regs-watchdog.h>
/* working in physical space... */
#undef S3C2410_WDOGREG

2
arch/arm/plat-s3c24xx/common-smdk.c
View file

@ -38,7 +38,7 @@
#include <mach/regs-gpio.h>
#include <mach/leds-gpio.h>
#include <asm/plat-s3c/nand.h>
#include <plat/nand.h>
#include <plat/common-smdk.h>
#include <plat/devs.h>

4
arch/arm/plat-s3c24xx/devs.c
View file

@ -29,11 +29,11 @@
#include <asm/irq.h>
#include <plat/regs-serial.h>
#include <asm/plat-s3c24xx/udc.h>
#include <plat/udc.h>
#include <plat/devs.h>
#include <plat/cpu.h>
#include <asm/plat-s3c24xx/regs-spi.h>
#include <plat/regs-spi.h>
/* Serial port registrations */

0
include/asm-arm/plat-s3c24xx/mci.h → arch/arm/plat-s3c24xx/include/plat/mci.h
View file

0
include/asm-arm/plat-s3c24xx/regs-spi.h → arch/arm/plat-s3c24xx/include/plat/regs-spi.h
View file

0
include/asm-arm/plat-s3c24xx/regs-udc.h → arch/arm/plat-s3c24xx/include/plat/regs-udc.h
View file

0
include/asm-arm/plat-s3c24xx/udc.h → arch/arm/plat-s3c24xx/include/plat/udc.h
View file

4
drivers/i2c/busses/i2c-s3c2410.c
View file

@ -40,8 +40,8 @@
#include <asm/io.h>
#include <mach/regs-gpio.h>
#include <asm/plat-s3c/regs-iic.h>
#include <asm/plat-s3c/iic.h>
#include <plat/regs-iic.h>
#include <plat/iic.h>
/* i2c controller state */

2
drivers/mmc/host/s3cmci.c
View file

@ -25,7 +25,7 @@
#include <mach/regs-sdi.h>
#include <mach/regs-gpio.h>
#include <asm/plat-s3c24xx/mci.h>
#include <plat/mci.h>
#include "s3cmci.h"

4
drivers/mtd/nand/s3c2410.c
View file

@ -45,8 +45,8 @@
#include <asm/io.h>
#include <asm/plat-s3c/regs-nand.h>
#include <asm/plat-s3c/nand.h>
#include <plat/regs-nand.h>
#include <plat/nand.h>
#ifdef CONFIG_MTD_NAND_S3C2410_HWECC
static int hardware_ecc = 1;

2
drivers/rtc/rtc-s3c.c
View file

@ -26,7 +26,7 @@
#include <asm/uaccess.h>
#include <asm/io.h>
#include <asm/irq.h>
#include <asm/plat-s3c/regs-rtc.h>
#include <plat/regs-rtc.h>
/* I have yet to find an S3C implementation with more than one
* of these rtc blocks in */

2
drivers/spi/spi_s3c24xx.c
View file

@ -28,7 +28,7 @@
#include <mach/hardware.h>
#include <mach/regs-gpio.h>
#include <asm/plat-s3c24xx/regs-spi.h>
#include <plat/regs-spi.h>
#include <mach/spi.h>
struct s3c24xx_spi {

4
drivers/usb/gadget/s3c2410_udc.c
View file

@ -53,8 +53,8 @@
#include <mach/hardware.h>
#include <mach/regs-gpio.h>
#include <asm/plat-s3c24xx/regs-udc.h>
#include <asm/plat-s3c24xx/udc.h>
#include <plat/regs-udc.h>
#include <plat/udc.h>
#include "s3c2410_udc.h"

2
drivers/watchdog/s3c2410_wdt.c
View file

@ -42,7 +42,7 @@
#undef S3C_VA_WATCHDOG
#define S3C_VA_WATCHDOG (0)
#include <asm/plat-s3c/regs-watchdog.h>
#include <plat/regs-watchdog.h>
#define PFX "s3c2410-wdt: "

2
sound/soc/s3c24xx/s3c2443-ac97.c
View file

@ -28,7 +28,7 @@
#include <sound/soc.h>
#include <mach/hardware.h>
#include <asm/plat-s3c/regs-ac97.h>
#include <plat/regs-ac97.h>
#include <mach/regs-gpio.h>
#include <mach/regs-clock.h>
#include <mach/audio.h>