Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fba67001 authored Nov 29, 2008 by Russell King Committed by Russell King Nov 29, 2008

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

parents 7577fdfa e8563596

arch/arm/mach-s3c2410/dma.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -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] = {

arch/arm/mach-s3c2410/include/mach/system-reset.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -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>

arch/arm/mach-s3c2410/mach-bast.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -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>

arch/arm/mach-s3c2410/mach-h1940.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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>

arch/arm/mach-s3c2410/mach-n30.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -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 */