ARM: pxa: move platform_data definitions

Platform data for device drivers should be defined in include/linux/platform_data/*.h, not in the architecture and platform specific directories. This moves such data out of the pxa include directories

Arnd Bergmann committed 14 years ago

Commit 293b2da1 parent 2960ed386 files · +188 −188Browse files

Unified · Split

86 files

arch/arm/mach-mmp/aspenite.c +1 −1
arch/arm/mach-mmp/include/mach/mmp2.h +1 −1
arch/arm/mach-mmp/include/mach/pxa168.h +2 −2
arch/arm/mach-mmp/include/mach/pxa910.h +1 −1
arch/arm/mach-mmp/sram.c +1 −1
arch/arm/mach-mmp/teton_bga.c +1 −1
arch/arm/mach-pxa/am200epd.c +1 −1
arch/arm/mach-pxa/am300epd.c +1 −1
arch/arm/mach-pxa/balloon3.c +4 −4
arch/arm/mach-pxa/cm-x270.c +2 −2
arch/arm/mach-pxa/cm-x2xx.c +1 −1
arch/arm/mach-pxa/cm-x300.c +5 −5
arch/arm/mach-pxa/colibri-evalboard.c +2 −2
arch/arm/mach-pxa/colibri-pxa270-income.c +3 −3
arch/arm/mach-pxa/colibri-pxa300.c +2 −2
arch/arm/mach-pxa/colibri-pxa320.c +2 −2
arch/arm/mach-pxa/colibri-pxa3xx.c +3 −3
arch/arm/mach-pxa/corgi.c +2 −2
arch/arm/mach-pxa/csb726.c +2 −2
arch/arm/mach-pxa/devices.c +8 −8
arch/arm/mach-pxa/em-x270.c +5 −5
arch/arm/mach-pxa/eseries.c +2 −2
arch/arm/mach-pxa/ezx.c +4 −4
arch/arm/mach-pxa/gumstix.c +1 −1
arch/arm/mach-pxa/hx4700.c +1 −1
arch/arm/mach-pxa/idp.c +2 −2
arch/arm/mach-pxa/littleton.c +4 −4
arch/arm/mach-pxa/lpd270.c +4 −4
arch/arm/mach-pxa/lubbock.c +3 −3
arch/arm/mach-pxa/magician.c +4 −4
arch/arm/mach-pxa/mainstone.c +5 −5
arch/arm/mach-pxa/mioa701.c +4 −4
arch/arm/mach-pxa/mxm8x10.c +4 −4
arch/arm/mach-pxa/palm27x.c +4 −4
arch/arm/mach-pxa/palmld.c +5 −5
arch/arm/mach-pxa/palmt5.c +5 −5
arch/arm/mach-pxa/palmtc.c +3 −3
arch/arm/mach-pxa/palmte2.c +4 −4
arch/arm/mach-pxa/palmtreo.c +7 −7
arch/arm/mach-pxa/palmtx.c +5 −5
arch/arm/mach-pxa/palmz72.c +6 −6
arch/arm/mach-pxa/pcm990-baseboard.c +4 −4
arch/arm/mach-pxa/poodle.c +3 −3
arch/arm/mach-pxa/pxa27x.c +1 −1
arch/arm/mach-pxa/pxa2xx.c +1 −1
arch/arm/mach-pxa/pxa3xx-ulpi.c +1 −1
arch/arm/mach-pxa/pxa3xx.c +1 −1
arch/arm/mach-pxa/raumfeld.c +4 −4
arch/arm/mach-pxa/saar.c +1 −1
arch/arm/mach-pxa/spitz.c +4 −4
arch/arm/mach-pxa/stargate2.c +1 −1
arch/arm/mach-pxa/tavorevb.c +2 −2
arch/arm/mach-pxa/tosa.c +2 −2
arch/arm/mach-pxa/trizeps4.c +4 −4
arch/arm/mach-pxa/viper.c +2 −2
arch/arm/mach-pxa/vpac270.c +4 −4
arch/arm/mach-pxa/z2.c +3 −3
arch/arm/mach-pxa/zeus.c +4 −4
arch/arm/mach-pxa/zylonite.c +5 −5
drivers/ata/pata_pxa.c +1 −1
drivers/dma/mmp_tdma.c +1 −1
drivers/input/keyboard/pxa27x_keypad.c +1 −1
drivers/input/keyboard/pxa930_rotary.c +1 −1
drivers/input/mouse/pxa930_trkball.c +1 −1
drivers/media/video/pxa_camera.c +1 −1
drivers/mmc/host/pxamci.c +1 −1
drivers/mtd/nand/pxa3xx_nand.c +1 −1
drivers/net/irda/pxaficp_ir.c +1 −1
drivers/pcmcia/pxa2xx_viper.c +1 −1
drivers/usb/host/ohci-pxa27x.c +2 −2
drivers/video/pxafb.c +1 −1
include/linux/platform_data/asoc-palm27x.h +0 −0
include/linux/platform_data/ata-pxa.h +0 −0
include/linux/platform_data/camera-pxa.h +0 −0
include/linux/platform_data/dma-mmp_tdma.h +0 −0
include/linux/platform_data/irda-pxaficp.h +0 −0
include/linux/platform_data/keyboard-pxa930_rotary.h +0 −0
include/linux/platform_data/keypad-pxa27x.h +0 −0
include/linux/platform_data/mmc-pxamci.h +0 −0
include/linux/platform_data/mouse-pxa930_trkball.h +0 −0
include/linux/platform_data/mtd-nand-pxa3xx.h +0 −0
include/linux/platform_data/pcmcia-pxa2xx_viper.h +0 −0
include/linux/platform_data/usb-ohci-pxa27x.h +0 −0
include/linux/platform_data/usb-pxa3xx-ulpi.h +0 −0
include/linux/platform_data/video-pxafb.h +0 −0
sound/soc/pxa/palm27x.c +1 −1

arch/arm/mach-mmp/aspenite.c+1−1

@@ -27,7 +27,7 @@ · 26 unmodified lines
27	27	#include <mach/irqs.h>
28	28	#include <video/pxa168fb.h>
29	29	#include <linux/input.h>
30		−#include <plat/pxa27x_keypad.h>
	30	+#include <linux/platform_data/keypad-pxa27x.h>
31	31
32	32	#include "common.h"
33	33

arch/arm/mach-mmp/include/mach/mmp2.h+1−1

@@ -13,7 +13,7 @@ extern void mmp2_clear_pmic_int(void); · 12 unmodified lines
13	13	#include <linux/i2c.h>
14	14	#include <linux/i2c/pxa-i2c.h>
15	15	#include <mach/devices.h>
16		−#include <mach/sram.h>
	16	+#include <linux/platform_data/dma-mmp_tdma.h>
17	17
18	18	extern struct pxa_device_desc mmp2_device_uart1;
19	19	extern struct pxa_device_desc mmp2_device_uart2;

arch/arm/mach-mmp/include/mach/pxa168.h+2−2

@@ -11,9 +11,9 @@ extern void pxa168_clear_keypad_wakeup(void); · 10 unmodified lines
11	11	#include <linux/i2c.h>
12	12	#include <linux/i2c/pxa-i2c.h>
13	13	#include <mach/devices.h>
14		−#include <plat/pxa3xx_nand.h>
	14	+#include <linux/platform_data/mtd-nand-pxa3xx.h>
15	15	#include <video/pxa168fb.h>
16		−#include <plat/pxa27x_keypad.h>
	16	+#include <linux/platform_data/keypad-pxa27x.h>
17	17	#include <mach/cputype.h>
18	18	#include <linux/pxa168_eth.h>
19	19	#include <linux/platform_data/mv_usb.h>

arch/arm/mach-mmp/include/mach/pxa910.h+1−1

@@ -9,7 +9,7 @@ extern void __init pxa910_init_irq(void); · 8 unmodified lines
9	9	#include <linux/i2c.h>
10	10	#include <linux/i2c/pxa-i2c.h>
11	11	#include <mach/devices.h>
12		−#include <plat/pxa3xx_nand.h>
	12	+#include <linux/platform_data/mtd-nand-pxa3xx.h>
13	13
14	14	extern struct pxa_device_desc pxa910_device_uart1;
15	15	extern struct pxa_device_desc pxa910_device_uart2;

arch/arm/mach-mmp/sram.c+1−1

@@ -22,7 +22,7 @@ · 21 unmodified lines
22	22	#include <linux/slab.h>
23	23	#include <linux/genalloc.h>
24	24
25		−#include <mach/sram.h>
	25	+#include <linux/platform_data/dma-mmp_tdma.h>
26	26
27	27	struct sram_bank_info {
28	28	char *pool_name;

arch/arm/mach-mmp/teton_bga.c+1−1

@@ -17,7 +17,7 @@ · 16 unmodified lines
17	17	#include <linux/platform_device.h>
18	18	#include <linux/gpio.h>
19	19	#include <linux/input.h>
20		−#include <plat/pxa27x_keypad.h>
	20	+#include <linux/platform_data/keypad-pxa27x.h>
21	21	#include <linux/i2c.h>
22	22
23	23	#include <asm/mach-types.h>

arch/arm/mach-pxa/am200epd.c+1−1

@@ -32,7 +32,7 @@ · 31 unmodified lines
32	32
33	33	#include <mach/pxa25x.h>
34	34	#include <mach/gumstix.h>
35		−#include <mach/pxafb.h>
	35	+#include <linux/platform_data/video-pxafb.h>
36	36
37	37	#include "generic.h"
38	38

arch/arm/mach-pxa/am300epd.c+1−1

@@ -30,7 +30,7 @@ · 29 unmodified lines
30	30
31	31	#include <mach/gumstix.h>
32	32	#include <mach/mfp-pxa25x.h>
33		−#include <mach/pxafb.h>
	33	+#include <linux/platform_data/video-pxafb.h>
34	34
35	35	#include "generic.h"
36	36

arch/arm/mach-pxa/balloon3.c+4−4

@@ -45,12 +45,12 @@ · 44 unmodified lines
45	45	#include <mach/pxa27x.h>
46	46	#include <mach/balloon3.h>
47	47	#include <mach/audio.h>
48		−#include <mach/pxafb.h>
49		−#include <mach/mmc.h>
	48	+#include <linux/platform_data/video-pxafb.h>
	49	+#include <linux/platform_data/mmc-pxamci.h>
50	50	#include <mach/udc.h>
51	51	#include <mach/pxa27x-udc.h>
52		−#include <mach/irda.h>
53		−#include <mach/ohci.h>
	52	+#include <linux/platform_data/irda-pxaficp.h>
	53	+#include <linux/platform_data/usb-ohci-pxa27x.h>
54	54
55	55	#include "generic.h"
56	56	#include "devices.h"

arch/arm/mach-pxa/cm-x270.c+2−2

@@ -22,8 +22,8 @@ · 21 unmodified lines
22	22	#include <linux/spi/libertas_spi.h>
23	23
24	24	#include <mach/pxa27x.h>
25		−#include <mach/ohci.h>
26		−#include <mach/mmc.h>
	25	+#include <linux/platform_data/usb-ohci-pxa27x.h>
	26	+#include <linux/platform_data/mmc-pxamci.h>
27	27
28	28	#include "generic.h"
29	29

arch/arm/mach-pxa/cm-x2xx.c+1−1

@@ -24,7 +24,7 @@ · 23 unmodified lines
24	24	#include <mach/pxa25x.h>
25	25	#include <mach/pxa27x.h>
26	26	#include <mach/audio.h>
27		−#include <mach/pxafb.h>
	27	+#include <linux/platform_data/video-pxafb.h>
28	28	#include <mach/smemc.h>
29	29
30	30	#include <asm/hardware/it8152.h>

arch/arm/mach-pxa/cm-x300.c+5−5

@@ -48,12 +48,12 @@ · 47 unmodified lines
48	48
49	49	#include <mach/pxa300.h>
50	50	#include <mach/pxa27x-udc.h>
51		−#include <mach/pxafb.h>
52		−#include <mach/mmc.h>
53		−#include <mach/ohci.h>
54		−#include <plat/pxa3xx_nand.h>
	51	+#include <linux/platform_data/video-pxafb.h>
	52	+#include <linux/platform_data/mmc-pxamci.h>
	53	+#include <linux/platform_data/usb-ohci-pxa27x.h>
	54	+#include <linux/platform_data/mtd-nand-pxa3xx.h>
55	55	#include <mach/audio.h>
56		−#include <mach/pxa3xx-u2d.h>
	56	+#include <linux/platform_data/usb-pxa3xx-ulpi.h>
57	57
58	58	#include <asm/mach/map.h>
59	59

arch/arm/mach-pxa/colibri-evalboard.c+2−2

@@ -23,8 +23,8 @@ · 22 unmodified lines
23	23
24	24	#include <mach/pxa27x.h>
25	25	#include <mach/colibri.h>
26		−#include <mach/mmc.h>
27		−#include <mach/ohci.h>
	26	+#include <linux/platform_data/mmc-pxamci.h>
	27	+#include <linux/platform_data/usb-ohci-pxa27x.h>
28	28	#include <mach/pxa27x-udc.h>
29	29
30	30	#include "generic.h"

arch/arm/mach-pxa/colibri-pxa270-income.c+3−3

@@ -27,11 +27,11 @@ · 26 unmodified lines
27	27	#include <asm/mach-types.h>
28	28
29	29	#include <mach/hardware.h>
30		−#include <mach/mmc.h>
31		−#include <mach/ohci.h>
	30	+#include <linux/platform_data/mmc-pxamci.h>
	31	+#include <linux/platform_data/usb-ohci-pxa27x.h>
32	32	#include <mach/pxa27x.h>
33	33	#include <mach/pxa27x-udc.h>
34		−#include <mach/pxafb.h>
	34	+#include <linux/platform_data/video-pxafb.h>
35	35
36	36	#include "devices.h"
37	37	#include "generic.h"

arch/arm/mach-pxa/colibri-pxa300.c+2−2

@@ -24,8 +24,8 @@ · 23 unmodified lines
24	24
25	25	#include <mach/pxa300.h>
26	26	#include <mach/colibri.h>
27		−#include <mach/ohci.h>
28		−#include <mach/pxafb.h>
	27	+#include <linux/platform_data/usb-ohci-pxa27x.h>
	28	+#include <linux/platform_data/video-pxafb.h>
29	29	#include <mach/audio.h>
30	30
31	31	#include "generic.h"

arch/arm/mach-pxa/colibri-pxa320.c+2−2

@@ -25,8 +25,8 @@ · 24 unmodified lines
25	25
26	26	#include <mach/pxa320.h>
27	27	#include <mach/colibri.h>
28		−#include <mach/pxafb.h>
29		−#include <mach/ohci.h>
	28	+#include <linux/platform_data/video-pxafb.h>
	29	+#include <linux/platform_data/usb-ohci-pxa27x.h>
30	30	#include <mach/audio.h>
31	31	#include <mach/pxa27x-udc.h>
32	32	#include <mach/udc.h>

arch/arm/mach-pxa/colibri-pxa3xx.c+3−3

@@ -24,9 +24,9 @@ · 23 unmodified lines
24	24	#include <mach/pxa3xx-regs.h>
25	25	#include <mach/mfp-pxa300.h>
26	26	#include <mach/colibri.h>
27		−#include <mach/mmc.h>
28		−#include <mach/pxafb.h>
29		−#include <plat/pxa3xx_nand.h>
	27	+#include <linux/platform_data/mmc-pxamci.h>
	28	+#include <linux/platform_data/video-pxafb.h>
	29	+#include <linux/platform_data/mtd-nand-pxa3xx.h>
30	30
31	31	#include "generic.h"
32	32	#include "devices.h"

arch/arm/mach-pxa/corgi.c+2−2

@@ -46,8 +46,8 @@ · 45 unmodified lines
46	46	#include <asm/mach/irq.h>
47	47
48	48	#include <mach/pxa25x.h>
49		−#include <mach/irda.h>
50		−#include <mach/mmc.h>
	49	+#include <linux/platform_data/irda-pxaficp.h>
	50	+#include <linux/platform_data/mmc-pxamci.h>
51	51	#include <mach/udc.h>
52	52	#include <mach/corgi.h>
53	53	#include <mach/sharpsl_pm.h>

arch/arm/mach-pxa/csb726.c+2−2

@@ -23,8 +23,8 @@ · 22 unmodified lines
23	23	#include <asm/mach/arch.h>
24	24	#include <mach/csb726.h>
25	25	#include <mach/pxa27x.h>
26		−#include <mach/mmc.h>
27		−#include <mach/ohci.h>
	26	+#include <linux/platform_data/mmc-pxamci.h>
	27	+#include <linux/platform_data/usb-ohci-pxa27x.h>
28	28	#include <mach/audio.h>
29	29	#include <mach/smemc.h>
30	30

arch/arm/mach-pxa/devices.c+8−8

@@ -8,17 +8,17 @@ · 7 unmodified lines
8	8
9	9	#include <asm/pmu.h>
10	10	#include <mach/udc.h>
11		−#include <mach/pxa3xx-u2d.h>
12		−#include <mach/pxafb.h>
13		−#include <mach/mmc.h>
14		−#include <mach/irda.h>
	11	+#include <linux/platform_data/usb-pxa3xx-ulpi.h>
	12	+#include <linux/platform_data/video-pxafb.h>
	13	+#include <linux/platform_data/mmc-pxamci.h>
	14	+#include <linux/platform_data/irda-pxaficp.h>
15	15	#include <mach/irqs.h>
16		−#include <mach/ohci.h>
17		−#include <plat/pxa27x_keypad.h>
18		−#include <mach/camera.h>
	16	+#include <linux/platform_data/usb-ohci-pxa27x.h>
	17	+#include <linux/platform_data/keypad-pxa27x.h>
	18	+#include <linux/platform_data/camera-pxa.h>
19	19	#include <mach/audio.h>
20	20	#include <mach/hardware.h>
21		−#include <plat/pxa3xx_nand.h>
	21	+#include <linux/platform_data/mtd-nand-pxa3xx.h>
22	22
23	23	#include "devices.h"
24	24	#include "generic.h"

arch/arm/mach-pxa/em-x270.c+5−5

@@ -42,11 +42,11 @@ · 41 unmodified lines
42	42	#include <mach/pxa27x.h>
43	43	#include <mach/pxa27x-udc.h>
44	44	#include <mach/audio.h>
45		−#include <mach/pxafb.h>
46		−#include <mach/ohci.h>
47		−#include <mach/mmc.h>
48		−#include <plat/pxa27x_keypad.h>
49		−#include <mach/camera.h>
	45	+#include <linux/platform_data/video-pxafb.h>
	46	+#include <linux/platform_data/usb-ohci-pxa27x.h>
	47	+#include <linux/platform_data/mmc-pxamci.h>
	48	+#include <linux/platform_data/keypad-pxa27x.h>
	49	+#include <linux/platform_data/camera-pxa.h>
50	50
51	51	#include "generic.h"
52	52	#include "devices.h"

arch/arm/mach-pxa/eseries.c+2−2

@@ -32,9 +32,9 @@ · 31 unmodified lines
32	32	#include <mach/eseries-gpio.h>
33	33	#include <mach/eseries-irq.h>
34	34	#include <mach/audio.h>
35		−#include <mach/pxafb.h>
	35	+#include <linux/platform_data/video-pxafb.h>
36	36	#include <mach/udc.h>
37		−#include <mach/irda.h>
	37	+#include <linux/platform_data/irda-pxaficp.h>
38	38
39	39	#include "devices.h"
40	40	#include "generic.h"

arch/arm/mach-pxa/ezx.c+4−4

@@ -29,11 +29,11 @@ · 28 unmodified lines
29	29	#include <asm/mach/arch.h>
30	30
31	31	#include <mach/pxa27x.h>
32		−#include <mach/pxafb.h>
33		−#include <mach/ohci.h>
	32	+#include <linux/platform_data/video-pxafb.h>
	33	+#include <linux/platform_data/usb-ohci-pxa27x.h>
34	34	#include <mach/hardware.h>
35		−#include <plat/pxa27x_keypad.h>
36		−#include <mach/camera.h>
	35	+#include <linux/platform_data/keypad-pxa27x.h>
	36	+#include <linux/platform_data/camera-pxa.h>
37	37
38	38	#include "devices.h"
39	39	#include "generic.h"

arch/arm/mach-pxa/gumstix.c+1−1

@@ -41,7 +41,7 @@ · 40 unmodified lines
41	41	#include <asm/mach/flash.h>
42	42
43	43	#include <mach/pxa25x.h>
44		−#include <mach/mmc.h>
	44	+#include <linux/platform_data/mmc-pxamci.h>
45	45	#include <mach/udc.h>
46	46	#include <mach/gumstix.h>
47	47

arch/arm/mach-pxa/hx4700.c+1−1

@@ -45,7 +45,7 @@ · 44 unmodified lines
45	45
46	46	#include <mach/pxa27x.h>
47	47	#include <mach/hx4700.h>
48		−#include <mach/irda.h>
	48	+#include <linux/platform_data/irda-pxaficp.h>
49	49
50	50	#include <sound/ak4641.h>
51	51	#include <video/platform_lcd.h>

arch/arm/mach-pxa/idp.c+2−2

@@ -33,9 +33,9 @@ · 32 unmodified lines
33	33
34	34	#include <mach/pxa25x.h>
35	35	#include <mach/idp.h>
36		−#include <mach/pxafb.h>
	36	+#include <linux/platform_data/video-pxafb.h>
37	37	#include <mach/bitfield.h>
38		−#include <mach/mmc.h>
	38	+#include <linux/platform_data/mmc-pxamci.h>
39	39
40	40	#include "generic.h"
41	41	#include "devices.h"

arch/arm/mach-pxa/littleton.c+4−4

@@ -42,11 +42,11 @@ · 41 unmodified lines
42	42	#include <asm/mach/irq.h>
43	43
44	44	#include <mach/pxa300.h>
45		−#include <mach/pxafb.h>
46		−#include <mach/mmc.h>
47		−#include <plat/pxa27x_keypad.h>
	45	+#include <linux/platform_data/video-pxafb.h>
	46	+#include <linux/platform_data/mmc-pxamci.h>
	47	+#include <linux/platform_data/keypad-pxa27x.h>
48	48	#include <mach/littleton.h>
49		−#include <plat/pxa3xx_nand.h>
	49	+#include <linux/platform_data/mtd-nand-pxa3xx.h>
50	50
51	51	#include "generic.h"
52	52

arch/arm/mach-pxa/lpd270.c+4−4

@@ -41,10 +41,10 @@ · 40 unmodified lines
41	41	#include <mach/pxa27x.h>
42	42	#include <mach/lpd270.h>
43	43	#include <mach/audio.h>
44		−#include <mach/pxafb.h>
45		−#include <mach/mmc.h>
46		−#include <mach/irda.h>
47		−#include <mach/ohci.h>
	44	+#include <linux/platform_data/video-pxafb.h>
	45	+#include <linux/platform_data/mmc-pxamci.h>
	46	+#include <linux/platform_data/irda-pxaficp.h>
	47	+#include <linux/platform_data/usb-ohci-pxa27x.h>
48	48	#include <mach/smemc.h>
49	49
50	50	#include "generic.h"

arch/arm/mach-pxa/lubbock.c+3−3

@@ -46,9 +46,9 @@ · 45 unmodified lines
46	46	#include <mach/audio.h>
47	47	#include <mach/lubbock.h>
48	48	#include <mach/udc.h>
49		−#include <mach/irda.h>
50		−#include <mach/pxafb.h>
51		−#include <mach/mmc.h>
	49	+#include <linux/platform_data/irda-pxaficp.h>
	50	+#include <linux/platform_data/video-pxafb.h>
	51	+#include <linux/platform_data/mmc-pxamci.h>
52	52	#include <mach/pm.h>
53	53	#include <mach/smemc.h>
54	54

arch/arm/mach-pxa/magician.c+4−4

@@ -38,10 +38,10 @@ · 37 unmodified lines
38	38
39	39	#include <mach/pxa27x.h>
40	40	#include <mach/magician.h>
41		−#include <mach/pxafb.h>
42		−#include <mach/mmc.h>
43		−#include <mach/irda.h>
44		−#include <mach/ohci.h>
	41	+#include <linux/platform_data/video-pxafb.h>
	42	+#include <linux/platform_data/mmc-pxamci.h>
	43	+#include <linux/platform_data/irda-pxaficp.h>
	44	+#include <linux/platform_data/usb-ohci-pxa27x.h>
45	45
46	46	#include "devices.h"
47	47	#include "generic.h"

arch/arm/mach-pxa/mainstone.c+5−5

@@ -45,11 +45,11 @@ · 44 unmodified lines
45	45	#include <mach/pxa27x.h>
46	46	#include <mach/mainstone.h>
47	47	#include <mach/audio.h>
48		−#include <mach/pxafb.h>
49		−#include <mach/mmc.h>
50		−#include <mach/irda.h>
51		−#include <mach/ohci.h>
52		−#include <plat/pxa27x_keypad.h>
	48	+#include <linux/platform_data/video-pxafb.h>
	49	+#include <linux/platform_data/mmc-pxamci.h>
	50	+#include <linux/platform_data/irda-pxaficp.h>
	51	+#include <linux/platform_data/usb-ohci-pxa27x.h>
	52	+#include <linux/platform_data/keypad-pxa27x.h>
53	53	#include <mach/smemc.h>
54	54
55	55	#include "generic.h"

arch/arm/mach-pxa/mioa701.c+4−4

@@ -46,12 +46,12 @@ · 45 unmodified lines
46	46
47	47	#include <mach/pxa27x.h>
48	48	#include <mach/regs-rtc.h>
49		−#include <plat/pxa27x_keypad.h>
50		−#include <mach/pxafb.h>
51		−#include <mach/mmc.h>
	49	+#include <linux/platform_data/keypad-pxa27x.h>
	50	+#include <linux/platform_data/video-pxafb.h>
	51	+#include <linux/platform_data/mmc-pxamci.h>
52	52	#include <mach/udc.h>
53	53	#include <mach/pxa27x-udc.h>
54		−#include <mach/camera.h>
	54	+#include <linux/platform_data/camera-pxa.h>
55	55	#include <mach/audio.h>
56	56	#include <mach/smemc.h>
57	57	#include <media/soc_camera.h>

arch/arm/mach-pxa/mxm8x10.c+4−4

@@ -24,11 +24,11 @@ · 23 unmodified lines
24	24	#include <linux/gpio.h>
25	25	#include <linux/i2c/pxa-i2c.h>
26	26
27		−#include <plat/pxa3xx_nand.h>
	27	+#include <linux/platform_data/mtd-nand-pxa3xx.h>
28	28
29		−#include <mach/pxafb.h>
30		−#include <mach/mmc.h>
31		−#include <mach/ohci.h>
	29	+#include <linux/platform_data/video-pxafb.h>
	30	+#include <linux/platform_data/mmc-pxamci.h>
	31	+#include <linux/platform_data/usb-ohci-pxa27x.h>
32	32	#include <mach/pxa320.h>
33	33
34	34	#include <mach/mxm8x10.h>

arch/arm/mach-pxa/palm27x.c+4−4

@@ -29,11 +29,11 @@ · 28 unmodified lines
29	29
30	30	#include <mach/pxa27x.h>
31	31	#include <mach/audio.h>
32		−#include <mach/mmc.h>
33		−#include <mach/pxafb.h>
34		−#include <mach/irda.h>
	32	+#include <linux/platform_data/mmc-pxamci.h>
	33	+#include <linux/platform_data/video-pxafb.h>
	34	+#include <linux/platform_data/irda-pxaficp.h>
35	35	#include <mach/udc.h>
36		−#include <mach/palmasoc.h>
	36	+#include <linux/platform_data/asoc-palm27x.h>
37	37	#include <mach/palm27x.h>
38	38
39	39	#include "generic.h"

arch/arm/mach-pxa/palmld.c+5−5

@@ -35,11 +35,11 @@ · 34 unmodified lines
35	35	#include <mach/pxa27x.h>
36	36	#include <mach/audio.h>
37	37	#include <mach/palmld.h>
38		−#include <mach/mmc.h>
39		−#include <mach/pxafb.h>
40		−#include <mach/irda.h>
41		−#include <plat/pxa27x_keypad.h>
42		−#include <mach/palmasoc.h>
	38	+#include <linux/platform_data/mmc-pxamci.h>
	39	+#include <linux/platform_data/video-pxafb.h>
	40	+#include <linux/platform_data/irda-pxaficp.h>
	41	+#include <linux/platform_data/keypad-pxa27x.h>
	42	+#include <linux/platform_data/asoc-palm27x.h>
43	43	#include <mach/palm27x.h>
44	44
45	45	#include "generic.h"

arch/arm/mach-pxa/palmt5.c+5−5

@@ -36,12 +36,12 @@ · 35 unmodified lines
36	36	#include <mach/pxa27x.h>
37	37	#include <mach/audio.h>
38	38	#include <mach/palmt5.h>
39		−#include <mach/mmc.h>
40		−#include <mach/pxafb.h>
41		−#include <mach/irda.h>
42		−#include <plat/pxa27x_keypad.h>
	39	+#include <linux/platform_data/mmc-pxamci.h>
	40	+#include <linux/platform_data/video-pxafb.h>
	41	+#include <linux/platform_data/irda-pxaficp.h>
	42	+#include <linux/platform_data/keypad-pxa27x.h>
43	43	#include <mach/udc.h>
44		−#include <mach/palmasoc.h>
	44	+#include <linux/platform_data/asoc-palm27x.h>
45	45	#include <mach/palm27x.h>
46	46
47	47	#include "generic.h"

arch/arm/mach-pxa/palmtc.c+3−3

@@ -34,9 +34,9 @@ · 33 unmodified lines
34	34	#include <mach/pxa25x.h>
35	35	#include <mach/audio.h>
36	36	#include <mach/palmtc.h>
37		−#include <mach/mmc.h>
38		−#include <mach/pxafb.h>
39		−#include <mach/irda.h>
	37	+#include <linux/platform_data/mmc-pxamci.h>
	38	+#include <linux/platform_data/video-pxafb.h>
	39	+#include <linux/platform_data/irda-pxaficp.h>
40	40	#include <mach/udc.h>
41	41
42	42	#include "generic.h"

arch/arm/mach-pxa/palmte2.c+4−4

@@ -34,11 +34,11 @@ · 33 unmodified lines
34	34	#include <mach/pxa25x.h>
35	35	#include <mach/audio.h>
36	36	#include <mach/palmte2.h>
37		−#include <mach/mmc.h>
38		−#include <mach/pxafb.h>
39		−#include <mach/irda.h>
	37	+#include <linux/platform_data/mmc-pxamci.h>
	38	+#include <linux/platform_data/video-pxafb.h>
	39	+#include <linux/platform_data/irda-pxaficp.h>
40	40	#include <mach/udc.h>
41		−#include <mach/palmasoc.h>
	41	+#include <linux/platform_data/asoc-palm27x.h>
42	42
43	43	#include "generic.h"
44	44	#include "devices.h"

arch/arm/mach-pxa/palmtreo.c+7−7

@@ -35,15 +35,15 @@ · 34 unmodified lines
35	35	#include <mach/pxa27x-udc.h>
36	36	#include <mach/audio.h>
37	37	#include <mach/palmtreo.h>
38		−#include <mach/mmc.h>
39		−#include <mach/pxafb.h>
40		−#include <mach/irda.h>
41		−#include <plat/pxa27x_keypad.h>
	38	+#include <linux/platform_data/mmc-pxamci.h>
	39	+#include <linux/platform_data/video-pxafb.h>
	40	+#include <linux/platform_data/irda-pxaficp.h>
	41	+#include <linux/platform_data/keypad-pxa27x.h>
42	42	#include <mach/udc.h>
43		−#include <mach/ohci.h>
	43	+#include <linux/platform_data/usb-ohci-pxa27x.h>
44	44	#include <mach/pxa2xx-regs.h>
45		−#include <mach/palmasoc.h>
46		−#include <mach/camera.h>
	45	+#include <linux/platform_data/asoc-palm27x.h>
	46	+#include <linux/platform_data/camera-pxa.h>
47	47	#include <mach/palm27x.h>
48	48
49	49	#include <sound/pxa2xx-lib.h>

arch/arm/mach-pxa/palmtx.c+5−5

@@ -40,12 +40,12 @@ · 39 unmodified lines
40	40	#include <mach/pxa27x.h>
41	41	#include <mach/audio.h>
42	42	#include <mach/palmtx.h>
43		−#include <mach/mmc.h>
44		−#include <mach/pxafb.h>
45		−#include <mach/irda.h>
46		−#include <plat/pxa27x_keypad.h>
	43	+#include <linux/platform_data/mmc-pxamci.h>
	44	+#include <linux/platform_data/video-pxafb.h>
	45	+#include <linux/platform_data/irda-pxaficp.h>
	46	+#include <linux/platform_data/keypad-pxa27x.h>
47	47	#include <mach/udc.h>
48		−#include <mach/palmasoc.h>
	48	+#include <linux/platform_data/asoc-palm27x.h>
49	49	#include <mach/palm27x.h>
50	50
51	51	#include "generic.h"

arch/arm/mach-pxa/palmz72.c+6−6

@@ -40,16 +40,16 @@ · 39 unmodified lines
40	40	#include <mach/pxa27x.h>
41	41	#include <mach/audio.h>
42	42	#include <mach/palmz72.h>
43		−#include <mach/mmc.h>
44		−#include <mach/pxafb.h>
45		−#include <mach/irda.h>
46		−#include <plat/pxa27x_keypad.h>
	43	+#include <linux/platform_data/mmc-pxamci.h>
	44	+#include <linux/platform_data/video-pxafb.h>
	45	+#include <linux/platform_data/irda-pxaficp.h>
	46	+#include <linux/platform_data/keypad-pxa27x.h>
47	47	#include <mach/udc.h>
48		−#include <mach/palmasoc.h>
	48	+#include <linux/platform_data/asoc-palm27x.h>
49	49	#include <mach/palm27x.h>
50	50
51	51	#include <mach/pm.h>
52		−#include <mach/camera.h>
	52	+#include <linux/platform_data/camera-pxa.h>
53	53
54	54	#include <media/soc_camera.h>
55	55

arch/arm/mach-pxa/pcm990-baseboard.c+4−4

@@ -28,14 +28,14 @@ · 27 unmodified lines
28	28
29	29	#include <media/soc_camera.h>
30	30
31		−#include <mach/camera.h>
	31	+#include <linux/platform_data/camera-pxa.h>
32	32	#include <asm/mach/map.h>
33	33	#include <mach/pxa27x.h>
34	34	#include <mach/audio.h>
35		−#include <mach/mmc.h>
36		−#include <mach/ohci.h>
	35	+#include <linux/platform_data/mmc-pxamci.h>
	36	+#include <linux/platform_data/usb-ohci-pxa27x.h>
37	37	#include <mach/pcm990_baseboard.h>
38		−#include <mach/pxafb.h>
	38	+#include <linux/platform_data/video-pxafb.h>
39	39
40	40	#include "devices.h"
41	41	#include "generic.h"

arch/arm/mach-pxa/poodle.c+3−3

@@ -40,11 +40,11 @@ · 39 unmodified lines
40	40	#include <asm/mach/irq.h>
41	41
42	42	#include <mach/pxa25x.h>
43		−#include <mach/mmc.h>
	43	+#include <linux/platform_data/mmc-pxamci.h>
44	44	#include <mach/udc.h>
45		−#include <mach/irda.h>
	45	+#include <linux/platform_data/irda-pxaficp.h>
46	46	#include <mach/poodle.h>
47		−#include <mach/pxafb.h>
	47	+#include <linux/platform_data/video-pxafb.h>
48	48
49	49	#include <asm/hardware/scoop.h>
50	50	#include <asm/hardware/locomo.h>

arch/arm/mach-pxa/pxa27x.c+1−1

@@ -30,7 +30,7 @@ · 29 unmodified lines
30	30	#include <mach/irqs.h>
31	31	#include <mach/pxa27x.h>
32	32	#include <mach/reset.h>
33		−#include <mach/ohci.h>
	33	+#include <linux/platform_data/usb-ohci-pxa27x.h>
34	34	#include <mach/pm.h>
35	35	#include <mach/dma.h>
36	36	#include <mach/smemc.h>

arch/arm/mach-pxa/pxa2xx.c+1−1

@@ -19,7 +19,7 @@ · 18 unmodified lines
19	19	#include <mach/pxa2xx-regs.h>
20	20	#include <mach/mfp-pxa25x.h>
21	21	#include <mach/reset.h>
22		−#include <mach/irda.h>
	22	+#include <linux/platform_data/irda-pxaficp.h>
23	23
24	24	void pxa2xx_clear_reset_status(unsigned int mask)
25	25	{

arch/arm/mach-pxa/pxa3xx-ulpi.c+1−1

@@ -27,7 +27,7 @@ · 26 unmodified lines
27	27
28	28	#include <mach/hardware.h>
29	29	#include <mach/regs-u2d.h>
30		−#include <mach/pxa3xx-u2d.h>
	30	+#include <linux/platform_data/usb-pxa3xx-ulpi.h>
31	31
32	32	struct pxa3xx_u2d_ulpi {
33	33	struct clk *clk;

arch/arm/mach-pxa/pxa3xx.c+1−1

@@ -27,7 +27,7 @@ · 26 unmodified lines
27	27	#include <mach/hardware.h>
28	28	#include <mach/pxa3xx-regs.h>
29	29	#include <mach/reset.h>
30		−#include <mach/ohci.h>
	30	+#include <linux/platform_data/usb-ohci-pxa27x.h>
31	31	#include <mach/pm.h>
32	32	#include <mach/dma.h>
33	33	#include <mach/smemc.h>

arch/arm/mach-pxa/raumfeld.c+4−4

@@ -49,10 +49,10 @@ · 48 unmodified lines
49	49	#include <asm/mach/arch.h>
50	50
51	51	#include <mach/pxa300.h>
52		−#include <mach/ohci.h>
53		−#include <mach/pxafb.h>
54		−#include <mach/mmc.h>
55		−#include <plat/pxa3xx_nand.h>
	52	+#include <linux/platform_data/usb-ohci-pxa27x.h>
	53	+#include <linux/platform_data/video-pxafb.h>
	54	+#include <linux/platform_data/mmc-pxamci.h>
	55	+#include <linux/platform_data/mtd-nand-pxa3xx.h>
56	56
57	57	#include "generic.h"
58	58	#include "devices.h"

arch/arm/mach-pxa/saar.c+1−1

@@ -32,7 +32,7 @@ · 31 unmodified lines
32	32	#include <asm/mach/flash.h>
33	33
34	34	#include <mach/pxa930.h>
35		−#include <mach/pxafb.h>
	35	+#include <linux/platform_data/video-pxafb.h>
36	36
37	37	#include "devices.h"
38	38	#include "generic.h"

arch/arm/mach-pxa/spitz.c+4−4

@@ -41,10 +41,10 @@ · 40 unmodified lines
41	41	#include <mach/pxa27x.h>
42	42	#include <mach/pxa27x-udc.h>
43	43	#include <mach/reset.h>
44		−#include <mach/irda.h>
45		−#include <mach/mmc.h>
46		−#include <mach/ohci.h>
47		−#include <mach/pxafb.h>
	44	+#include <linux/platform_data/irda-pxaficp.h>
	45	+#include <linux/platform_data/mmc-pxamci.h>
	46	+#include <linux/platform_data/usb-ohci-pxa27x.h>
	47	+#include <linux/platform_data/video-pxafb.h>
48	48	#include <mach/spitz.h>
49	49	#include <mach/sharpsl_pm.h>
50	50	#include <mach/smemc.h>

arch/arm/mach-pxa/stargate2.c+1−1

@@ -44,7 +44,7 @@ · 43 unmodified lines
44	44	#include <asm/mach/flash.h>
45	45
46	46	#include <mach/pxa27x.h>
47		−#include <mach/mmc.h>
	47	+#include <linux/platform_data/mmc-pxamci.h>
48	48	#include <mach/udc.h>
49	49	#include <mach/pxa27x-udc.h>
50	50	#include <mach/smemc.h>

arch/arm/mach-pxa/tavorevb.c+2−2

@@ -24,8 +24,8 @@ · 23 unmodified lines
24	24	#include <asm/mach/arch.h>
25	25
26	26	#include <mach/pxa930.h>
27		−#include <mach/pxafb.h>
28		−#include <plat/pxa27x_keypad.h>
	27	+#include <linux/platform_data/video-pxafb.h>
	28	+#include <linux/platform_data/keypad-pxa27x.h>
29	29
30	30	#include "devices.h"
31	31	#include "generic.h"

arch/arm/mach-pxa/tosa.c+2−2

@@ -42,8 +42,8 @@ · 41 unmodified lines
42	42
43	43	#include <mach/pxa25x.h>
44	44	#include <mach/reset.h>
45		−#include <mach/irda.h>
46		−#include <mach/mmc.h>
	45	+#include <linux/platform_data/irda-pxaficp.h>
	46	+#include <linux/platform_data/mmc-pxamci.h>
47	47	#include <mach/udc.h>
48	48	#include <mach/tosa_bt.h>
49	49	#include <mach/audio.h>

arch/arm/mach-pxa/trizeps4.c+4−4

@@ -43,10 +43,10 @@ · 42 unmodified lines
43	43	#include <mach/pxa27x.h>
44	44	#include <mach/trizeps4.h>
45	45	#include <mach/audio.h>
46		−#include <mach/pxafb.h>
47		−#include <mach/mmc.h>
48		−#include <mach/irda.h>
49		−#include <mach/ohci.h>
	46	+#include <linux/platform_data/video-pxafb.h>
	47	+#include <linux/platform_data/mmc-pxamci.h>
	48	+#include <linux/platform_data/irda-pxaficp.h>
	49	+#include <linux/platform_data/usb-ohci-pxa27x.h>
50	50	#include <mach/smemc.h>
51	51
52	52	#include "generic.h"

arch/arm/mach-pxa/viper.c+2−2

@@ -48,9 +48,9 @@ · 47 unmodified lines
48	48
49	49	#include <mach/pxa25x.h>
50	50	#include <mach/audio.h>
51		−#include <mach/pxafb.h>
	51	+#include <linux/platform_data/video-pxafb.h>
52	52	#include <mach/regs-uart.h>
53		−#include <mach/arcom-pcmcia.h>
	53	+#include <linux/platform_data/pcmcia-pxa2xx_viper.h>
54	54	#include <mach/viper.h>
55	55
56	56	#include <asm/setup.h>

arch/arm/mach-pxa/vpac270.c+4−4

@@ -33,12 +33,12 @@ · 32 unmodified lines
33	33	#include <mach/pxa27x.h>
34	34	#include <mach/audio.h>
35	35	#include <mach/vpac270.h>
36		−#include <mach/mmc.h>
37		−#include <mach/pxafb.h>
38		−#include <mach/ohci.h>
	36	+#include <linux/platform_data/mmc-pxamci.h>
	37	+#include <linux/platform_data/video-pxafb.h>
	38	+#include <linux/platform_data/usb-ohci-pxa27x.h>
39	39	#include <mach/pxa27x-udc.h>
40	40	#include <mach/udc.h>
41		−#include <mach/pata_pxa.h>
	41	+#include <linux/platform_data/ata-pxa.h>
42	42
43	43	#include "generic.h"
44	44	#include "devices.h"

arch/arm/mach-pxa/z2.c+3−3

@@ -37,9 +37,9 @@ · 36 unmodified lines
37	37	#include <mach/pxa27x.h>
38	38	#include <mach/mfp-pxa27x.h>
39	39	#include <mach/z2.h>
40		−#include <mach/pxafb.h>
41		−#include <mach/mmc.h>
42		−#include <plat/pxa27x_keypad.h>
	40	+#include <linux/platform_data/video-pxafb.h>
	41	+#include <linux/platform_data/mmc-pxamci.h>
	42	+#include <linux/platform_data/keypad-pxa27x.h>
43	43	#include <mach/pm.h>
44	44
45	45	#include "generic.h"

arch/arm/mach-pxa/zeus.c+4−4

@@ -38,14 +38,14 @@ · 37 unmodified lines
38	38
39	39	#include <mach/pxa27x.h>
40	40	#include <mach/regs-uart.h>
41		−#include <mach/ohci.h>
42		−#include <mach/mmc.h>
	41	+#include <linux/platform_data/usb-ohci-pxa27x.h>
	42	+#include <linux/platform_data/mmc-pxamci.h>
43	43	#include <mach/pxa27x-udc.h>
44	44	#include <mach/udc.h>
45		−#include <mach/pxafb.h>
	45	+#include <linux/platform_data/video-pxafb.h>
46	46	#include <mach/pm.h>
47	47	#include <mach/audio.h>
48		−#include <mach/arcom-pcmcia.h>
	48	+#include <linux/platform_data/pcmcia-pxa2xx_viper.h>
49	49	#include <mach/zeus.h>
50	50	#include <mach/smemc.h>
51	51

arch/arm/mach-pxa/zylonite.c+5−5

@@ -26,12 +26,12 @@ · 25 unmodified lines
26	26	#include <asm/mach/arch.h>
27	27	#include <mach/pxa3xx.h>
28	28	#include <mach/audio.h>
29		−#include <mach/pxafb.h>
	29	+#include <linux/platform_data/video-pxafb.h>
30	30	#include <mach/zylonite.h>
31		−#include <mach/mmc.h>
32		−#include <mach/ohci.h>
33		−#include <plat/pxa27x_keypad.h>
34		−#include <plat/pxa3xx_nand.h>
	31	+#include <linux/platform_data/mmc-pxamci.h>
	32	+#include <linux/platform_data/usb-ohci-pxa27x.h>
	33	+#include <linux/platform_data/keypad-pxa27x.h>
	34	+#include <linux/platform_data/mtd-nand-pxa3xx.h>
35	35
36	36	#include "devices.h"
37	37	#include "generic.h"

drivers/ata/pata_pxa.c+1−1

@@ -32,7 +32,7 @@ · 31 unmodified lines
32	32	#include <scsi/scsi_host.h>
33	33
34	34	#include <mach/pxa2xx-regs.h>
35		−#include <mach/pata_pxa.h>
	35	+#include <linux/platform_data/ata-pxa.h>
36	36	#include <mach/dma.h>
37	37
38	38	#define DRV_NAME "pata_pxa"

drivers/dma/mmp_tdma.c+1−1

@@ -19,7 +19,7 @@ · 18 unmodified lines
19	19	#include <linux/platform_device.h>
20	20	#include <linux/device.h>
21	21	#include <mach/regs-icu.h>
22		−#include <mach/sram.h>
	22	+#include <linux/platform_data/dma-mmp_tdma.h>
23	23
24	24	#include "dmaengine.h"
25	25

drivers/input/keyboard/pxa27x_keypad.c+1−1

@@ -32,7 +32,7 @@ · 31 unmodified lines
32	32	#include <asm/mach/map.h>
33	33
34	34	#include <mach/hardware.h>
35		−#include <plat/pxa27x_keypad.h>
	35	+#include <linux/platform_data/keypad-pxa27x.h>
36	36	/*
37	37	* Keypad Controller registers
38	38	*/

drivers/input/keyboard/pxa930_rotary.c+1−1

@@ -15,7 +15,7 @@ · 14 unmodified lines
15	15	#include <linux/io.h>
16	16	#include <linux/slab.h>
17	17
18		−#include <mach/pxa930_rotary.h>
	18	+#include <linux/platform_data/keyboard-pxa930_rotary.h>
19	19
20	20	#define SBCR (0x04)
21	21	#define ERCR (0x0c)

drivers/input/mouse/pxa930_trkball.c+1−1

@@ -20,7 +20,7 @@ · 19 unmodified lines
20	20	#include <linux/slab.h>
21	21
22	22	#include <mach/hardware.h>
23		−#include <mach/pxa930_trkball.h>
	23	+#include <linux/platform_data/mouse-pxa930_trkball.h>
24	24
25	25	/* Trackball Controller Register Definitions */
26	26	#define TBCR (0x000C)

drivers/media/video/pxa_camera.c+1−1

@@ -37,7 +37,7 @@ · 36 unmodified lines
37	37	#include <linux/videodev2.h>
38	38
39	39	#include <mach/dma.h>
40		−#include <mach/camera.h>
	40	+#include <linux/platform_data/camera-pxa.h>
41	41
42	42	#define PXA_CAM_VERSION "0.0.6"
43	43	#define PXA_CAM_DRV_NAME "pxa27x-camera"

drivers/mmc/host/pxamci.c+1−1

@@ -35,7 +35,7 @@ · 34 unmodified lines
35	35
36	36	#include <mach/hardware.h>
37	37	#include <mach/dma.h>
38		−#include <mach/mmc.h>
	38	+#include <linux/platform_data/mmc-pxamci.h>
39	39
40	40	#include "pxamci.h"
41	41

drivers/mtd/nand/pxa3xx_nand.c+1−1

@@ -24,7 +24,7 @@ · 23 unmodified lines
24	24	#include <linux/slab.h>
25	25
26	26	#include <mach/dma.h>
27		−#include <plat/pxa3xx_nand.h>
	27	+#include <linux/platform_data/mtd-nand-pxa3xx.h>
28	28
29	29	#define CHIP_DELAY_TIMEOUT (2 * HZ/10)
30	30	#define NAND_STOP_DELAY (2 * HZ/50)

drivers/net/irda/pxaficp_ir.c+1−1

@@ -28,7 +28,7 @@ · 27 unmodified lines
28	28	#include <net/irda/irda_device.h>
29	29
30	30	#include <mach/dma.h>
31		−#include <mach/irda.h>
	31	+#include <linux/platform_data/irda-pxaficp.h>
32	32	#include <mach/regs-uart.h>
33	33	#include <mach/regs-ost.h>
34	34

drivers/pcmcia/pxa2xx_viper.c+1−1

@@ -25,7 +25,7 @@ · 24 unmodified lines
25	25
26	26	#include <asm/irq.h>
27	27
28		−#include <mach/arcom-pcmcia.h>
	28	+#include <linux/platform_data/pcmcia-pxa2xx_viper.h>
29	29
30	30	#include "soc_common.h"
31	31	#include "pxa2xx_base.h"

drivers/usb/host/ohci-pxa27x.c+2−2

@@ -24,8 +24,8 @@ · 23 unmodified lines
24	24	#include <linux/platform_device.h>
25	25	#include <linux/clk.h>
26	26	#include <mach/hardware.h>
27		−#include <mach/ohci.h>
28		−#include <mach/pxa3xx-u2d.h>
	27	+#include <linux/platform_data/usb-ohci-pxa27x.h>
	28	+#include <linux/platform_data/usb-pxa3xx-ulpi.h>
29	29
30	30	/*
31	31	* UHC: USB Host Controller (OHCI-like) register definitions

drivers/video/pxafb.c+1−1

@@ -61,7 +61,7 @@ · 60 unmodified lines
61	61	#include <asm/irq.h>
62	62	#include <asm/div64.h>
63	63	#include <mach/bitfield.h>
64		−#include <mach/pxafb.h>
	64	+#include <linux/platform_data/video-pxafb.h>
65	65
66	66	/*
67	67	* Complain if VAR is out of range.

include/linux/platform_data/asoc-palm27x.hrenamed from arch/arm/mach-pxa/include/mach/palmasoc.h+0−0

File renamed without changes.

include/linux/platform_data/ata-pxa.hrenamed from arch/arm/mach-pxa/include/mach/pata_pxa.h+0−0

File renamed without changes.

include/linux/platform_data/camera-pxa.hrenamed from arch/arm/mach-pxa/include/mach/camera.h+0−0

File renamed without changes.

include/linux/platform_data/dma-mmp_tdma.hrenamed from arch/arm/mach-mmp/include/mach/sram.h+0−0

File renamed without changes.

include/linux/platform_data/irda-pxaficp.hrenamed from arch/arm/mach-pxa/include/mach/irda.h+0−0

File renamed without changes.

include/linux/platform_data/keyboard-pxa930_rotary.hrenamed from arch/arm/mach-pxa/include/mach/pxa930_rotary.h+0−0

File renamed without changes.

include/linux/platform_data/keypad-pxa27x.hrenamed from arch/arm/plat-pxa/include/plat/pxa27x_keypad.h+0−0

File renamed without changes.

include/linux/platform_data/mmc-pxamci.hrenamed from arch/arm/mach-pxa/include/mach/mmc.h+0−0

File renamed without changes.

include/linux/platform_data/mouse-pxa930_trkball.hrenamed from arch/arm/mach-pxa/include/mach/pxa930_trkball.h+0−0

File renamed without changes.

include/linux/platform_data/mtd-nand-pxa3xx.hrenamed from arch/arm/plat-pxa/include/plat/pxa3xx_nand.h+0−0

File renamed without changes.

include/linux/platform_data/pcmcia-pxa2xx_viper.hrenamed from arch/arm/mach-pxa/include/mach/arcom-pcmcia.h+0−0

File renamed without changes.

include/linux/platform_data/usb-ohci-pxa27x.hrenamed from arch/arm/mach-pxa/include/mach/ohci.h+0−0

File renamed without changes.

include/linux/platform_data/usb-pxa3xx-ulpi.hrenamed from arch/arm/mach-pxa/include/mach/pxa3xx-u2d.h+0−0

File renamed without changes.

include/linux/platform_data/video-pxafb.hrenamed from arch/arm/mach-pxa/include/mach/pxafb.h+0−0

File renamed without changes.

sound/soc/pxa/palm27x.c+1−1

@@ -25,7 +25,7 @@ · 24 unmodified lines
25	25
26	26	#include <asm/mach-types.h>
27	27	#include <mach/audio.h>
28		−#include <mach/palmasoc.h>
	28	+#include <linux/platform_data/asoc-palm27x.h>
29	29
30	30	#include "../codecs/wm9712.h"
31	31	#include "pxa2xx-ac97.h"