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

ARM: move serial_sa1100.h header file to linux/platform_data

This is really driver platform data, so move it to the appropriate
directory.

Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

Russell King 6920b5a7 ddffeb8c

+18 -16
+4 -2
arch/arm/include/asm/mach/serial_sa1100.h include/linux/platform_data/sa11x0-serial.h
··· 1 1 /* 2 - * arch/arm/include/asm/mach/serial_sa1100.h 3 - * 4 2 * Author: Nicolas Pitre 5 3 * 6 4 * Moved and changed lots, Russell King 7 5 * 8 6 * Low level machine dependent UART functions. 9 7 */ 8 + #ifndef SA11X0_SERIAL_H 9 + #define SA11X0_SERIAL_H 10 10 11 11 struct uart_port; 12 12 struct uart_info; ··· 28 28 #else 29 29 #define sa1100_register_uart_fns(fns) do { } while (0) 30 30 #define sa1100_register_uart(idx,port) do { } while (0) 31 + #endif 32 + 31 33 #endif
+1 -1
arch/arm/mach-sa1100/assabet.c
··· 14 14 #include <linux/module.h> 15 15 #include <linux/errno.h> 16 16 #include <linux/ioport.h> 17 + #include <linux/platform_data/sa11x0-serial.h> 17 18 #include <linux/serial_core.h> 18 19 #include <linux/mfd/ucb1x00.h> 19 20 #include <linux/mtd/mtd.h> ··· 38 37 #include <asm/mach/flash.h> 39 38 #include <asm/mach/irda.h> 40 39 #include <asm/mach/map.h> 41 - #include <asm/mach/serial_sa1100.h> 42 40 #include <mach/assabet.h> 43 41 #include <linux/platform_data/mfd-mcp-sa11x0.h> 44 42 #include <mach/irqs.h>
+1 -1
arch/arm/mach-sa1100/badge4.c
··· 16 16 #include <linux/module.h> 17 17 #include <linux/init.h> 18 18 #include <linux/kernel.h> 19 + #include <linux/platform_data/sa11x0-serial.h> 19 20 #include <linux/platform_device.h> 20 21 #include <linux/delay.h> 21 22 #include <linux/tty.h> ··· 35 34 #include <asm/mach/flash.h> 36 35 #include <asm/mach/map.h> 37 36 #include <asm/hardware/sa1111.h> 38 - #include <asm/mach/serial_sa1100.h> 39 37 40 38 #include <mach/badge4.h> 41 39
+1 -1
arch/arm/mach-sa1100/cerf.c
··· 13 13 #include <linux/init.h> 14 14 #include <linux/kernel.h> 15 15 #include <linux/tty.h> 16 + #include <linux/platform_data/sa11x0-serial.h> 16 17 #include <linux/platform_device.h> 17 18 #include <linux/irq.h> 18 19 #include <linux/mtd/mtd.h> ··· 28 27 #include <asm/mach/arch.h> 29 28 #include <asm/mach/flash.h> 30 29 #include <asm/mach/map.h> 31 - #include <asm/mach/serial_sa1100.h> 32 30 33 31 #include <mach/cerf.h> 34 32 #include <linux/platform_data/mfd-mcp-sa11x0.h>
+1 -1
arch/arm/mach-sa1100/collie.c
··· 21 21 #include <linux/kernel.h> 22 22 #include <linux/tty.h> 23 23 #include <linux/delay.h> 24 + #include <linux/platform_data/sa11x0-serial.h> 24 25 #include <linux/platform_device.h> 25 26 #include <linux/mfd/ucb1x00.h> 26 27 #include <linux/mtd/mtd.h> ··· 41 40 #include <asm/mach/arch.h> 42 41 #include <asm/mach/flash.h> 43 42 #include <asm/mach/map.h> 44 - #include <asm/mach/serial_sa1100.h> 45 43 46 44 #include <asm/hardware/scoop.h> 47 45 #include <asm/mach/sharpsl_param.h>
+1 -1
arch/arm/mach-sa1100/h3xxx.c
··· 17 17 #include <linux/mfd/htc-egpio.h> 18 18 #include <linux/mtd/mtd.h> 19 19 #include <linux/mtd/partitions.h> 20 + #include <linux/platform_data/sa11x0-serial.h> 20 21 #include <linux/platform_device.h> 21 22 #include <linux/serial_core.h> 22 23 23 24 #include <asm/mach/flash.h> 24 25 #include <asm/mach/map.h> 25 - #include <asm/mach/serial_sa1100.h> 26 26 27 27 #include <mach/h3xxx.h> 28 28
+1 -1
arch/arm/mach-sa1100/hackkit.c
··· 18 18 #include <linux/module.h> 19 19 #include <linux/errno.h> 20 20 #include <linux/cpufreq.h> 21 + #include <linux/platform_data/sa11x0-serial.h> 21 22 #include <linux/serial_core.h> 22 23 #include <linux/mtd/mtd.h> 23 24 #include <linux/mtd/partitions.h> ··· 36 35 #include <asm/mach/flash.h> 37 36 #include <asm/mach/map.h> 38 37 #include <asm/mach/irq.h> 39 - #include <asm/mach/serial_sa1100.h> 40 38 41 39 #include <mach/hardware.h> 42 40 #include <mach/irqs.h>
+1 -1
arch/arm/mach-sa1100/jornada720.c
··· 17 17 #include <linux/kernel.h> 18 18 #include <linux/tty.h> 19 19 #include <linux/delay.h> 20 + #include <linux/platform_data/sa11x0-serial.h> 20 21 #include <linux/platform_device.h> 21 22 #include <linux/ioport.h> 22 23 #include <linux/mtd/mtd.h> ··· 31 30 #include <asm/mach/arch.h> 32 31 #include <asm/mach/flash.h> 33 32 #include <asm/mach/map.h> 34 - #include <asm/mach/serial_sa1100.h> 35 33 36 34 #include <mach/hardware.h> 37 35 #include <mach/irqs.h>
+1 -1
arch/arm/mach-sa1100/lart.c
··· 4 4 5 5 #include <linux/init.h> 6 6 #include <linux/kernel.h> 7 + #include <linux/platform_data/sa11x0-serial.h> 7 8 #include <linux/tty.h> 8 9 #include <linux/gpio.h> 9 10 #include <linux/leds.h> ··· 19 18 20 19 #include <asm/mach/arch.h> 21 20 #include <asm/mach/map.h> 22 - #include <asm/mach/serial_sa1100.h> 23 21 #include <linux/platform_data/mfd-mcp-sa11x0.h> 24 22 #include <mach/irqs.h> 25 23
+1 -1
arch/arm/mach-sa1100/nanoengine.c
··· 13 13 14 14 #include <linux/init.h> 15 15 #include <linux/kernel.h> 16 + #include <linux/platform_data/sa11x0-serial.h> 16 17 #include <linux/mtd/mtd.h> 17 18 #include <linux/mtd/partitions.h> 18 19 #include <linux/root_dev.h> ··· 25 24 #include <asm/mach/arch.h> 26 25 #include <asm/mach/flash.h> 27 26 #include <asm/mach/map.h> 28 - #include <asm/mach/serial_sa1100.h> 29 27 30 28 #include <mach/hardware.h> 31 29 #include <mach/nanoengine.h>
+1 -1
arch/arm/mach-sa1100/neponset.c
··· 7 7 #include <linux/irq.h> 8 8 #include <linux/kernel.h> 9 9 #include <linux/module.h> 10 + #include <linux/platform_data/sa11x0-serial.h> 10 11 #include <linux/platform_device.h> 11 12 #include <linux/pm.h> 12 13 #include <linux/serial_core.h> ··· 15 14 16 15 #include <asm/mach-types.h> 17 16 #include <asm/mach/map.h> 18 - #include <asm/mach/serial_sa1100.h> 19 17 #include <asm/hardware/sa1111.h> 20 18 #include <asm/sizes.h> 21 19
+1 -1
arch/arm/mach-sa1100/pleb.c
··· 6 6 #include <linux/kernel.h> 7 7 #include <linux/tty.h> 8 8 #include <linux/ioport.h> 9 + #include <linux/platform_data/sa11x0-serial.h> 9 10 #include <linux/platform_device.h> 10 11 #include <linux/irq.h> 11 12 #include <linux/io.h> ··· 19 18 #include <asm/mach/arch.h> 20 19 #include <asm/mach/map.h> 21 20 #include <asm/mach/flash.h> 22 - #include <asm/mach/serial_sa1100.h> 23 21 #include <mach/irqs.h> 24 22 25 23 #include "generic.h"
+1 -1
arch/arm/mach-sa1100/shannon.c
··· 5 5 #include <linux/init.h> 6 6 #include <linux/device.h> 7 7 #include <linux/kernel.h> 8 + #include <linux/platform_data/sa11x0-serial.h> 8 9 #include <linux/tty.h> 9 10 #include <linux/mtd/mtd.h> 10 11 #include <linux/mtd/partitions.h> ··· 19 18 #include <asm/mach/arch.h> 20 19 #include <asm/mach/flash.h> 21 20 #include <asm/mach/map.h> 22 - #include <asm/mach/serial_sa1100.h> 23 21 #include <linux/platform_data/mfd-mcp-sa11x0.h> 24 22 #include <mach/shannon.h> 25 23 #include <mach/irqs.h>
+1 -1
arch/arm/mach-sa1100/simpad.c
··· 9 9 #include <linux/proc_fs.h> 10 10 #include <linux/string.h> 11 11 #include <linux/pm.h> 12 + #include <linux/platform_data/sa11x0-serial.h> 12 13 #include <linux/platform_device.h> 13 14 #include <linux/mfd/ucb1x00.h> 14 15 #include <linux/mtd/mtd.h> ··· 24 23 #include <asm/mach/arch.h> 25 24 #include <asm/mach/flash.h> 26 25 #include <asm/mach/map.h> 27 - #include <asm/mach/serial_sa1100.h> 28 26 #include <linux/platform_data/mfd-mcp-sa11x0.h> 29 27 #include <mach/simpad.h> 30 28 #include <mach/irqs.h>
+1 -1
drivers/tty/serial/sa1100.c
··· 29 29 #include <linux/init.h> 30 30 #include <linux/console.h> 31 31 #include <linux/sysrq.h> 32 + #include <linux/platform_data/sa11x0-serial.h> 32 33 #include <linux/platform_device.h> 33 34 #include <linux/tty.h> 34 35 #include <linux/tty_flip.h> ··· 40 39 #include <asm/irq.h> 41 40 #include <mach/hardware.h> 42 41 #include <mach/irqs.h> 43 - #include <asm/mach/serial_sa1100.h> 44 42 45 43 /* We've been assigned a range on the "Low-density serial ports" major */ 46 44 #define SERIAL_SA1100_MAJOR 204