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

Commit 4f5b31c3 authored Mar 06, 2009 by Mark Brown

Merge commit 's3c-iis-header' into HEAD

parents 86027ae7 899e6cf5

arch/arm/mach-s3c2410/dma.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -28,7 +28,7 @@
		#include <mach/regs-mem.h>
		#include <mach/regs-lcd.h>
		#include <mach/regs-sdi.h>
		#include <asm/plat-s3c24xx/regs-iis.h>
		#include <plat/regs-iis.h>
		#include <plat/regs-spi.h>

		static struct s3c24xx_dma_map __initdata s3c2410_dma_mappings[] = {

arch/arm/mach-s3c2410/include/mach/hardware.h

+0 −3

Original line number	Diff line number	Diff line
		@@ -131,7 +131,4 @@ extern int s3c2412_gpio_set_sleepcfg(unsigned int pin, unsigned int state);

		/* machine specific hardware definitions should go after this */

		/* currently here until moved into config (todo) */
		#define CONFIG_NO_MULTIWORD_IO

		#endif /* __ASM_ARCH_HARDWARE_H */

arch/arm/mach-s3c2410/include/mach/io.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -9,7 +9,7 @@
		#ifndef __ASM_ARM_ARCH_IO_H
		#define __ASM_ARM_ARCH_IO_H

		#include <mach/hardware.h>
		#include <mach/map.h>

		#define IO_SPACE_LIMIT 0xffffffff

arch/arm/mach-s3c2412/dma.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -29,8 +29,8 @@
		#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 <plat/regs-s3c2412-iis.h>
		#include <plat/regs-iis.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 }

arch/arm/mach-s3c2440/dma.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -28,7 +28,7 @@
		#include <mach/regs-mem.h>
		#include <mach/regs-lcd.h>
		#include <mach/regs-sdi.h>
		#include <asm/plat-s3c24xx/regs-iis.h>
		#include <plat/regs-iis.h>
		#include <plat/regs-spi.h>

		static struct s3c24xx_dma_map __initdata s3c2440_dma_mappings[] = {