---

yaml --- r: 327139 b: refs/heads/master c: 54ecf4f h: refs/heads/master i: 327137: 85f4abc 327135: bb65e8d v: v3
git-mirror · Sep 14, 2012 · 1766add · 1766add
1 parent 5271a44
commit 1766add
Show file tree

Hide file tree

Showing 12 changed files with 10 additions and 10 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 19d331010636a43318c09fbdaa5ae7ef4bb6f7eb
+refs/heads/master: 54ecf4f05637183ffd0ac98f906e45e271030a55
diff --git a/trunk/arch/arm/mach-w90x900/dev.c b/trunk/arch/arm/mach-w90x900/dev.c
@@ -34,11 +34,11 @@
 #include <asm/mach-types.h>
 
 #include <mach/regs-serial.h>
-#include <mach/nuc900_spi.h>
+#include <linux/platform_data/spi-nuc900.h>
 #include <mach/map.h>
-#include <mach/fb.h>
+#include <linux/platform_data/video-nuc900fb.h>
 #include <mach/regs-ldm.h>
-#include <mach/w90p910_keypad.h>
+#include <linux/platform_data/keypad-w90p910.h>
 
 #include "cpu.h"
 

diff --git a/trunk/arch/arm/mach-w90x900/mach-nuc950evb.c b/trunk/arch/arm/mach-w90x900/mach-nuc950evb.c
@@ -20,7 +20,7 @@
 #include <asm/mach/map.h>
 #include <asm/mach-types.h>
 #include <mach/map.h>
-#include <mach/fb.h>
+#include <linux/platform_data/video-nuc900fb.h>
 
 #include "nuc950.h"
 

diff --git a/trunk/drivers/i2c/busses/i2c-nuc900.c b/trunk/drivers/i2c/busses/i2c-nuc900.c
@@ -29,7 +29,7 @@
 #include <linux/io.h>
 
 #include <mach/mfp.h>
-#include <mach/i2c.h>
+#include <linux/platform_data/i2c-nuc900.h>
 
 /* nuc900 i2c registers offset */
 

diff --git a/trunk/drivers/input/keyboard/w90p910_keypad.c b/trunk/drivers/input/keyboard/w90p910_keypad.c
@@ -21,7 +21,7 @@
 #include <linux/io.h>
 #include <linux/slab.h>
 
-#include <mach/w90p910_keypad.h>
+#include <linux/platform_data/keypad-w90p910.h>
 
 /* Keypad Interface Control Registers */
 #define KPI_CONF		0x00

diff --git a/trunk/drivers/spi/spi-nuc900.c b/trunk/drivers/spi/spi-nuc900.c
@@ -26,7 +26,7 @@
 #include <linux/spi/spi.h>
 #include <linux/spi/spi_bitbang.h>
 
-#include <mach/nuc900_spi.h>
+#include <linux/platform_data/spi-nuc900.h>
 
 /* usi registers offset */
 #define USI_CNT		0x00

diff --git a/trunk/drivers/video/nuc900fb.c b/trunk/drivers/video/nuc900fb.c
@@ -38,7 +38,7 @@
 #include <mach/map.h>
 #include <mach/regs-clock.h>
 #include <mach/regs-ldm.h>
-#include <mach/fb.h>
+#include <linux/platform_data/video-nuc900fb.h>
 
 #include "nuc900fb.h"
 

diff --git a/trunk/drivers/video/nuc900fb.h b/trunk/drivers/video/nuc900fb.h
@@ -16,7 +16,7 @@
 #define __NUC900FB_H
 
 #include <mach/map.h>
-#include <mach/fb.h>
+#include <linux/platform_data/video-nuc900fb.h>
 
 enum nuc900_lcddrv_type {
 	LCDDRV_NUC910,

diff --git a/.../arch/arm/mach-w90x900/include/mach/i2c.h → .../include/linux/platform_data/i2c-nuc900.h b/.../arch/arm/mach-w90x900/include/mach/i2c.h → .../include/linux/platform_data/i2c-nuc900.h
diff --git a/...ach-w90x900/include/mach/w90p910_keypad.h → ...lude/linux/platform_data/keypad-w90p910.h b/...ach-w90x900/include/mach/w90p910_keypad.h → ...lude/linux/platform_data/keypad-w90p910.h
diff --git a/...rm/mach-w90x900/include/mach/nuc900_spi.h → .../include/linux/platform_data/spi-nuc900.h b/...rm/mach-w90x900/include/mach/nuc900_spi.h → .../include/linux/platform_data/spi-nuc900.h
diff --git a/...k/arch/arm/mach-w90x900/include/mach/fb.h → ...lude/linux/platform_data/video-nuc900fb.h b/...k/arch/arm/mach-w90x900/include/mach/fb.h → ...lude/linux/platform_data/video-nuc900fb.h