Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

ARM: S3C24XX: move spi-s3c24xx platdata out of mach

spi.h now only contains the definition of the platform data structure
for the driver in spi-s3c24xx.c . Therefore it does not need to stay
in include/mach but can instead live in linux/spi/s3c24xx.h .

Signed-off-by: Heiko Stuebner <heiko@sntech.de>
Cc: Grant Likely <grant.likely@secretlab.ca>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>

authored by

Heiko Stuebner and committed by
Kukjin Kim
f35ef7ca 0f78b244

+6 -7
+4 -5
arch/arm/mach-s3c2410/include/mach/spi.h include/linux/spi/s3c24xx.h
··· 1 - /* arch/arm/mach-s3c2410/include/mach/spi.h 2 - * 1 + /* 3 2 * Copyright (c) 2006 Simtec Electronics 4 3 * Ben Dooks <ben@simtec.co.uk> 5 4 * ··· 9 10 * published by the Free Software Foundation. 10 11 */ 11 12 12 - #ifndef __ASM_ARCH_SPI_H 13 - #define __ASM_ARCH_SPI_H __FILE__ 13 + #ifndef __LINUX_SPI_S3C24XX_H 14 + #define __LINUX_SPI_S3C24XX_H __FILE__ 14 15 15 16 struct s3c2410_spi_info { 16 17 int pin_cs; /* simple gpio cs */ ··· 23 24 void (*set_cs)(struct s3c2410_spi_info *spi, int cs, int pol); 24 25 }; 25 26 26 - #endif /* __ASM_ARCH_SPI_H */ 27 + #endif /* __LINUX_SPI_S3C24XX_H */
+1 -1
arch/arm/mach-s3c2440/mach-gta02.c
··· 38 38 #include <linux/platform_device.h> 39 39 #include <linux/serial_core.h> 40 40 #include <linux/spi/spi.h> 41 + #include <linux/spi/s3c24xx.h> 41 42 42 43 #include <linux/mmc/host.h> 43 44 ··· 74 73 #include <mach/regs-gpioj.h> 75 74 #include <mach/fb.h> 76 75 77 - #include <mach/spi.h> 78 76 #include <plat/usb-control.h> 79 77 #include <mach/regs-mem.h> 80 78 #include <mach/hardware.h>
+1 -1
drivers/spi/spi-s3c24xx.c
··· 24 24 25 25 #include <linux/spi/spi.h> 26 26 #include <linux/spi/spi_bitbang.h> 27 + #include <linux/spi/s3c24xx.h> 27 28 #include <linux/module.h> 28 29 29 30 #include <plat/regs-spi.h> 30 - #include <mach/spi.h> 31 31 32 32 #include <plat/fiq.h> 33 33 #include <asm/fiq.h>