diff options
author | Krzysztof Helt <krzysztof.h1@wp.pl> | 2007-10-16 04:29:04 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-16 12:43:17 -0400 |
commit | 84902b7af642c86a518c17629c0dbe705a4b6d14 (patch) | |
tree | b16dd021a3a5217557bb29c986be9615b8cddf48 | |
parent | 120c0b6d57257b2a3508d96bdaf54781935439f6 (diff) |
fbdev: change asm/uaccess.h to linux/uaccess.h
This patch replaces <asm/uaccess.h> with <linux/uaccess.h> after the
checkpatch.pl hint. The include of <asm/uaccess.h> is removed if the driver
does not use it.
Signed-off-by: Krzysztof Helt <krzysztof.h1@wp.pl>
Signed-off-by: Antonino Daplas <adaplas@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
36 files changed, 19 insertions, 37 deletions
diff --git a/drivers/video/amifb.c b/drivers/video/amifb.c index 1a849b870bc..f2e243c353f 100644 --- a/drivers/video/amifb.c +++ b/drivers/video/amifb.c | |||
@@ -52,7 +52,7 @@ | |||
52 | #include <linux/init.h> | 52 | #include <linux/init.h> |
53 | #include <linux/ioport.h> | 53 | #include <linux/ioport.h> |
54 | 54 | ||
55 | #include <asm/uaccess.h> | 55 | #include <linux/uaccess.h> |
56 | #include <asm/system.h> | 56 | #include <asm/system.h> |
57 | #include <asm/irq.h> | 57 | #include <asm/irq.h> |
58 | #include <asm/amigahw.h> | 58 | #include <asm/amigahw.h> |
diff --git a/drivers/video/arcfb.c b/drivers/video/arcfb.c index db15baca3f7..c3431691c9f 100644 --- a/drivers/video/arcfb.c +++ b/drivers/video/arcfb.c | |||
@@ -48,7 +48,7 @@ | |||
48 | #include <linux/arcfb.h> | 48 | #include <linux/arcfb.h> |
49 | #include <linux/platform_device.h> | 49 | #include <linux/platform_device.h> |
50 | 50 | ||
51 | #include <asm/uaccess.h> | 51 | #include <linux/uaccess.h> |
52 | 52 | ||
53 | #define floor8(a) (a&(~0x07)) | 53 | #define floor8(a) (a&(~0x07)) |
54 | #define floorXres(a,xres) (a&(~(xres - 1))) | 54 | #define floorXres(a,xres) (a&(~(xres - 1))) |
diff --git a/drivers/video/atafb.c b/drivers/video/atafb.c index 0038a0541c7..5d4fbaa53a6 100644 --- a/drivers/video/atafb.c +++ b/drivers/video/atafb.c | |||
@@ -58,7 +58,7 @@ | |||
58 | #include <linux/interrupt.h> | 58 | #include <linux/interrupt.h> |
59 | 59 | ||
60 | #include <asm/setup.h> | 60 | #include <asm/setup.h> |
61 | #include <asm/uaccess.h> | 61 | #include <linux/uaccess.h> |
62 | #include <asm/pgtable.h> | 62 | #include <asm/pgtable.h> |
63 | #include <asm/irq.h> | 63 | #include <asm/irq.h> |
64 | #include <asm/io.h> | 64 | #include <asm/io.h> |
diff --git a/drivers/video/aty/aty128fb.c b/drivers/video/aty/aty128fb.c index cfcbe37d2d7..cbd3308b669 100644 --- a/drivers/video/aty/aty128fb.c +++ b/drivers/video/aty/aty128fb.c | |||
@@ -56,7 +56,7 @@ | |||
56 | #include <linux/vmalloc.h> | 56 | #include <linux/vmalloc.h> |
57 | #include <linux/delay.h> | 57 | #include <linux/delay.h> |
58 | #include <linux/interrupt.h> | 58 | #include <linux/interrupt.h> |
59 | #include <asm/uaccess.h> | 59 | #include <linux/uaccess.h> |
60 | #include <linux/fb.h> | 60 | #include <linux/fb.h> |
61 | #include <linux/init.h> | 61 | #include <linux/init.h> |
62 | #include <linux/pci.h> | 62 | #include <linux/pci.h> |
diff --git a/drivers/video/aty/atyfb_base.c b/drivers/video/aty/atyfb_base.c index b537151136f..abe0c435a66 100644 --- a/drivers/video/aty/atyfb_base.c +++ b/drivers/video/aty/atyfb_base.c | |||
@@ -68,7 +68,7 @@ | |||
68 | #include <linux/backlight.h> | 68 | #include <linux/backlight.h> |
69 | 69 | ||
70 | #include <asm/io.h> | 70 | #include <asm/io.h> |
71 | #include <asm/uaccess.h> | 71 | #include <linux/uaccess.h> |
72 | 72 | ||
73 | #include <video/mach64.h> | 73 | #include <video/mach64.h> |
74 | #include "atyfb.h" | 74 | #include "atyfb.h" |
diff --git a/drivers/video/aty/mach64_cursor.c b/drivers/video/aty/mach64_cursor.c index fe2c6ad01a8..faf95da8fcb 100644 --- a/drivers/video/aty/mach64_cursor.c +++ b/drivers/video/aty/mach64_cursor.c | |||
@@ -8,7 +8,6 @@ | |||
8 | #include <linux/string.h> | 8 | #include <linux/string.h> |
9 | 9 | ||
10 | #include <asm/io.h> | 10 | #include <asm/io.h> |
11 | #include <asm/uaccess.h> | ||
12 | 11 | ||
13 | #ifdef __sparc__ | 12 | #ifdef __sparc__ |
14 | #include <asm/fbio.h> | 13 | #include <asm/fbio.h> |
diff --git a/drivers/video/aty/radeon_base.c b/drivers/video/aty/radeon_base.c index 4b747bdaeea..4f5dcd5f5c7 100644 --- a/drivers/video/aty/radeon_base.c +++ b/drivers/video/aty/radeon_base.c | |||
@@ -69,7 +69,7 @@ | |||
69 | #include <linux/device.h> | 69 | #include <linux/device.h> |
70 | 70 | ||
71 | #include <asm/io.h> | 71 | #include <asm/io.h> |
72 | #include <asm/uaccess.h> | 72 | #include <linux/uaccess.h> |
73 | 73 | ||
74 | #ifdef CONFIG_PPC_OF | 74 | #ifdef CONFIG_PPC_OF |
75 | 75 | ||
diff --git a/drivers/video/backlight/cr_bllcd.c b/drivers/video/backlight/cr_bllcd.c index 92e201e81fb..26add889860 100644 --- a/drivers/video/backlight/cr_bllcd.c +++ b/drivers/video/backlight/cr_bllcd.c | |||
@@ -36,7 +36,6 @@ | |||
36 | #include <linux/backlight.h> | 36 | #include <linux/backlight.h> |
37 | #include <linux/lcd.h> | 37 | #include <linux/lcd.h> |
38 | #include <linux/pci.h> | 38 | #include <linux/pci.h> |
39 | #include <asm/uaccess.h> | ||
40 | 39 | ||
41 | /* The LVDS- and panel power controls sits on the | 40 | /* The LVDS- and panel power controls sits on the |
42 | * GPIO port of the ISA bridge. | 41 | * GPIO port of the ISA bridge. |
diff --git a/drivers/video/backlight/progear_bl.c b/drivers/video/backlight/progear_bl.c index 836ab4df0ef..15fb4d58b5b 100644 --- a/drivers/video/backlight/progear_bl.c +++ b/drivers/video/backlight/progear_bl.c | |||
@@ -23,7 +23,6 @@ | |||
23 | #include <linux/fb.h> | 23 | #include <linux/fb.h> |
24 | #include <linux/backlight.h> | 24 | #include <linux/backlight.h> |
25 | #include <linux/pci.h> | 25 | #include <linux/pci.h> |
26 | #include <asm/uaccess.h> | ||
27 | 26 | ||
28 | #define PMU_LPCR 0xB0 | 27 | #define PMU_LPCR 0xB0 |
29 | #define SB_MPS1 0x61 | 28 | #define SB_MPS1 0x61 |
diff --git a/drivers/video/clps711xfb.c b/drivers/video/clps711xfb.c index dea6579941b..17b5267f44d 100644 --- a/drivers/video/clps711xfb.c +++ b/drivers/video/clps711xfb.c | |||
@@ -29,7 +29,7 @@ | |||
29 | 29 | ||
30 | #include <asm/hardware.h> | 30 | #include <asm/hardware.h> |
31 | #include <asm/mach-types.h> | 31 | #include <asm/mach-types.h> |
32 | #include <asm/uaccess.h> | 32 | #include <linux/uaccess.h> |
33 | 33 | ||
34 | #include <asm/hardware/clps7111.h> | 34 | #include <asm/hardware/clps7111.h> |
35 | #include <asm/arch/syspld.h> | 35 | #include <asm/arch/syspld.h> |
diff --git a/drivers/video/console/fbcon.c b/drivers/video/console/fbcon.c index e58c87b3e3a..6d0dcde66eb 100644 --- a/drivers/video/console/fbcon.c +++ b/drivers/video/console/fbcon.c | |||
@@ -78,7 +78,6 @@ | |||
78 | #include <asm/fb.h> | 78 | #include <asm/fb.h> |
79 | #include <asm/irq.h> | 79 | #include <asm/irq.h> |
80 | #include <asm/system.h> | 80 | #include <asm/system.h> |
81 | #include <asm/uaccess.h> | ||
82 | #ifdef CONFIG_ATARI | 81 | #ifdef CONFIG_ATARI |
83 | #include <asm/atariints.h> | 82 | #include <asm/atariints.h> |
84 | #endif | 83 | #endif |
diff --git a/drivers/video/console/softcursor.c b/drivers/video/console/softcursor.c index 03cfb7ac573..25f835bf3d7 100644 --- a/drivers/video/console/softcursor.c +++ b/drivers/video/console/softcursor.c | |||
@@ -15,7 +15,6 @@ | |||
15 | #include <linux/fb.h> | 15 | #include <linux/fb.h> |
16 | #include <linux/slab.h> | 16 | #include <linux/slab.h> |
17 | 17 | ||
18 | #include <asm/uaccess.h> | ||
19 | #include <asm/io.h> | 18 | #include <asm/io.h> |
20 | 19 | ||
21 | #include "fbcon.h" | 20 | #include "fbcon.h" |
diff --git a/drivers/video/cyber2000fb.c b/drivers/video/cyber2000fb.c index 30ede6e8830..9bb2cbfe4a3 100644 --- a/drivers/video/cyber2000fb.c +++ b/drivers/video/cyber2000fb.c | |||
@@ -50,7 +50,6 @@ | |||
50 | #include <asm/io.h> | 50 | #include <asm/io.h> |
51 | #include <asm/pgtable.h> | 51 | #include <asm/pgtable.h> |
52 | #include <asm/system.h> | 52 | #include <asm/system.h> |
53 | #include <asm/uaccess.h> | ||
54 | 53 | ||
55 | #ifdef __arm__ | 54 | #ifdef __arm__ |
56 | #include <asm/mach-types.h> | 55 | #include <asm/mach-types.h> |
diff --git a/drivers/video/epson1355fb.c b/drivers/video/epson1355fb.c index 33be46ccb54..cc2810ef5de 100644 --- a/drivers/video/epson1355fb.c +++ b/drivers/video/epson1355fb.c | |||
@@ -57,7 +57,7 @@ | |||
57 | 57 | ||
58 | #include <asm/types.h> | 58 | #include <asm/types.h> |
59 | #include <asm/io.h> | 59 | #include <asm/io.h> |
60 | #include <asm/uaccess.h> | 60 | #include <linux/uaccess.h> |
61 | 61 | ||
62 | #include <video/epson1355.h> | 62 | #include <video/epson1355.h> |
63 | 63 | ||
diff --git a/drivers/video/fb_defio.c b/drivers/video/fb_defio.c index 1a8643f053d..a0c5d9d90d7 100644 --- a/drivers/video/fb_defio.c +++ b/drivers/video/fb_defio.c | |||
@@ -19,7 +19,6 @@ | |||
19 | #include <linux/interrupt.h> | 19 | #include <linux/interrupt.h> |
20 | #include <linux/fb.h> | 20 | #include <linux/fb.h> |
21 | #include <linux/list.h> | 21 | #include <linux/list.h> |
22 | #include <asm/uaccess.h> | ||
23 | 22 | ||
24 | /* to support deferred IO */ | 23 | /* to support deferred IO */ |
25 | #include <linux/rmap.h> | 24 | #include <linux/rmap.h> |
diff --git a/drivers/video/fb_sys_fops.c b/drivers/video/fb_sys_fops.c index cf2538d669c..ff275d7f3ea 100644 --- a/drivers/video/fb_sys_fops.c +++ b/drivers/video/fb_sys_fops.c | |||
@@ -11,7 +11,7 @@ | |||
11 | */ | 11 | */ |
12 | #include <linux/fb.h> | 12 | #include <linux/fb.h> |
13 | #include <linux/module.h> | 13 | #include <linux/module.h> |
14 | #include <asm/uaccess.h> | 14 | #include <linux/uaccess.h> |
15 | 15 | ||
16 | ssize_t fb_sys_read(struct fb_info *info, char __user *buf, size_t count, | 16 | ssize_t fb_sys_read(struct fb_info *info, char __user *buf, size_t count, |
17 | loff_t *ppos) | 17 | loff_t *ppos) |
diff --git a/drivers/video/fbcmap.c b/drivers/video/fbcmap.c index 148108afdd5..91b78e69150 100644 --- a/drivers/video/fbcmap.c +++ b/drivers/video/fbcmap.c | |||
@@ -15,8 +15,7 @@ | |||
15 | #include <linux/module.h> | 15 | #include <linux/module.h> |
16 | #include <linux/fb.h> | 16 | #include <linux/fb.h> |
17 | #include <linux/slab.h> | 17 | #include <linux/slab.h> |
18 | 18 | #include <linux/uaccess.h> | |
19 | #include <asm/uaccess.h> | ||
20 | 19 | ||
21 | static u16 red2[] __read_mostly = { | 20 | static u16 red2[] __read_mostly = { |
22 | 0x0000, 0xaaaa | 21 | 0x0000, 0xaaaa |
diff --git a/drivers/video/hecubafb.c b/drivers/video/hecubafb.c index abfcb50364c..94e0df8a6f6 100644 --- a/drivers/video/hecubafb.c +++ b/drivers/video/hecubafb.c | |||
@@ -45,7 +45,7 @@ | |||
45 | #include <linux/init.h> | 45 | #include <linux/init.h> |
46 | #include <linux/platform_device.h> | 46 | #include <linux/platform_device.h> |
47 | #include <linux/list.h> | 47 | #include <linux/list.h> |
48 | #include <asm/uaccess.h> | 48 | #include <linux/uaccess.h> |
49 | 49 | ||
50 | /* Apollo controller specific defines */ | 50 | /* Apollo controller specific defines */ |
51 | #define APOLLO_START_NEW_IMG 0xA0 | 51 | #define APOLLO_START_NEW_IMG 0xA0 |
diff --git a/drivers/video/imsttfb.c b/drivers/video/imsttfb.c index 94f4511023d..3ab91bf2157 100644 --- a/drivers/video/imsttfb.c +++ b/drivers/video/imsttfb.c | |||
@@ -29,7 +29,7 @@ | |||
29 | #include <linux/init.h> | 29 | #include <linux/init.h> |
30 | #include <linux/pci.h> | 30 | #include <linux/pci.h> |
31 | #include <asm/io.h> | 31 | #include <asm/io.h> |
32 | #include <asm/uaccess.h> | 32 | #include <linux/uaccess.h> |
33 | 33 | ||
34 | #if defined(CONFIG_PPC) | 34 | #if defined(CONFIG_PPC) |
35 | #include <linux/nvram.h> | 35 | #include <linux/nvram.h> |
diff --git a/drivers/video/imxfb.c b/drivers/video/imxfb.c index a1258989859..986ffa6c70a 100644 --- a/drivers/video/imxfb.c +++ b/drivers/video/imxfb.c | |||
@@ -34,7 +34,6 @@ | |||
34 | 34 | ||
35 | #include <asm/hardware.h> | 35 | #include <asm/hardware.h> |
36 | #include <asm/io.h> | 36 | #include <asm/io.h> |
37 | #include <asm/uaccess.h> | ||
38 | #include <asm/arch/imxfb.h> | 37 | #include <asm/arch/imxfb.h> |
39 | 38 | ||
40 | /* | 39 | /* |
diff --git a/drivers/video/kyro/fbdev.c b/drivers/video/kyro/fbdev.c index 1c557990739..acb9370fdb1 100644 --- a/drivers/video/kyro/fbdev.c +++ b/drivers/video/kyro/fbdev.c | |||
@@ -21,7 +21,7 @@ | |||
21 | #include <linux/init.h> | 21 | #include <linux/init.h> |
22 | #include <linux/pci.h> | 22 | #include <linux/pci.h> |
23 | #include <asm/io.h> | 23 | #include <asm/io.h> |
24 | #include <asm/uaccess.h> | 24 | #include <linux/uaccess.h> |
25 | #ifdef CONFIG_MTRR | 25 | #ifdef CONFIG_MTRR |
26 | #include <asm/mtrr.h> | 26 | #include <asm/mtrr.h> |
27 | #endif | 27 | #endif |
diff --git a/drivers/video/matrox/matroxfb_base.c b/drivers/video/matrox/matroxfb_base.c index 86ca7b17900..b25972ac6ee 100644 --- a/drivers/video/matrox/matroxfb_base.c +++ b/drivers/video/matrox/matroxfb_base.c | |||
@@ -113,7 +113,7 @@ | |||
113 | #include "matroxfb_g450.h" | 113 | #include "matroxfb_g450.h" |
114 | #include <linux/matroxfb.h> | 114 | #include <linux/matroxfb.h> |
115 | #include <linux/interrupt.h> | 115 | #include <linux/interrupt.h> |
116 | #include <asm/uaccess.h> | 116 | #include <linux/uaccess.h> |
117 | 117 | ||
118 | #ifdef CONFIG_PPC_PMAC | 118 | #ifdef CONFIG_PPC_PMAC |
119 | #include <asm/machdep.h> | 119 | #include <asm/machdep.h> |
diff --git a/drivers/video/matrox/matroxfb_crtc2.c b/drivers/video/matrox/matroxfb_crtc2.c index 4b3344e0369..a6ab5b6a58d 100644 --- a/drivers/video/matrox/matroxfb_crtc2.c +++ b/drivers/video/matrox/matroxfb_crtc2.c | |||
@@ -15,7 +15,7 @@ | |||
15 | #include "matroxfb_misc.h" | 15 | #include "matroxfb_misc.h" |
16 | #include "matroxfb_DAC1064.h" | 16 | #include "matroxfb_DAC1064.h" |
17 | #include <linux/matroxfb.h> | 17 | #include <linux/matroxfb.h> |
18 | #include <asm/uaccess.h> | 18 | #include <linux/uaccess.h> |
19 | 19 | ||
20 | /* **************************************************** */ | 20 | /* **************************************************** */ |
21 | 21 | ||
diff --git a/drivers/video/matrox/matroxfb_g450.c b/drivers/video/matrox/matroxfb_g450.c index 4d610b405d4..6209a761f67 100644 --- a/drivers/video/matrox/matroxfb_g450.c +++ b/drivers/video/matrox/matroxfb_g450.c | |||
@@ -17,7 +17,6 @@ | |||
17 | #include "matroxfb_DAC1064.h" | 17 | #include "matroxfb_DAC1064.h" |
18 | #include "g450_pll.h" | 18 | #include "g450_pll.h" |
19 | #include <linux/matroxfb.h> | 19 | #include <linux/matroxfb.h> |
20 | #include <asm/uaccess.h> | ||
21 | #include <asm/div64.h> | 20 | #include <asm/div64.h> |
22 | 21 | ||
23 | #include "matroxfb_g450.h" | 22 | #include "matroxfb_g450.h" |
diff --git a/drivers/video/matrox/matroxfb_maven.c b/drivers/video/matrox/matroxfb_maven.c index de0d755f901..49cd53e46c0 100644 --- a/drivers/video/matrox/matroxfb_maven.c +++ b/drivers/video/matrox/matroxfb_maven.c | |||
@@ -18,7 +18,6 @@ | |||
18 | #include <linux/i2c.h> | 18 | #include <linux/i2c.h> |
19 | #include <linux/matroxfb.h> | 19 | #include <linux/matroxfb.h> |
20 | #include <asm/div64.h> | 20 | #include <asm/div64.h> |
21 | #include <asm/uaccess.h> | ||
22 | 21 | ||
23 | #define MAVEN_I2CID (0x1B) | 22 | #define MAVEN_I2CID (0x1B) |
24 | 23 | ||
diff --git a/drivers/video/neofb.c b/drivers/video/neofb.c index 731d7a5c5aa..4b6a99b5be0 100644 --- a/drivers/video/neofb.c +++ b/drivers/video/neofb.c | |||
@@ -72,7 +72,6 @@ | |||
72 | #include <asm/irq.h> | 72 | #include <asm/irq.h> |
73 | #include <asm/pgtable.h> | 73 | #include <asm/pgtable.h> |
74 | #include <asm/system.h> | 74 | #include <asm/system.h> |
75 | #include <asm/uaccess.h> | ||
76 | 75 | ||
77 | #ifdef CONFIG_MTRR | 76 | #ifdef CONFIG_MTRR |
78 | #include <asm/mtrr.h> | 77 | #include <asm/mtrr.h> |
diff --git a/drivers/video/pnx4008/pnxrgbfb.c b/drivers/video/pnx4008/pnxrgbfb.c index f29e66e2d77..685761a0732 100644 --- a/drivers/video/pnx4008/pnxrgbfb.c +++ b/drivers/video/pnx4008/pnxrgbfb.c | |||
@@ -26,7 +26,6 @@ | |||
26 | #include <linux/init.h> | 26 | #include <linux/init.h> |
27 | #include <linux/platform_device.h> | 27 | #include <linux/platform_device.h> |
28 | 28 | ||
29 | #include <asm/uaccess.h> | ||
30 | #include "sdum.h" | 29 | #include "sdum.h" |
31 | #include "fbcommon.h" | 30 | #include "fbcommon.h" |
32 | 31 | ||
diff --git a/drivers/video/ps3fb.c b/drivers/video/ps3fb.c index 646ec823c16..e0beb979cec 100644 --- a/drivers/video/ps3fb.c +++ b/drivers/video/ps3fb.c | |||
@@ -34,7 +34,7 @@ | |||
34 | #include <linux/kthread.h> | 34 | #include <linux/kthread.h> |
35 | #include <linux/freezer.h> | 35 | #include <linux/freezer.h> |
36 | 36 | ||
37 | #include <asm/uaccess.h> | 37 | #include <linux/uaccess.h> |
38 | #include <linux/fb.h> | 38 | #include <linux/fb.h> |
39 | #include <linux/init.h> | 39 | #include <linux/init.h> |
40 | #include <asm/time.h> | 40 | #include <asm/time.h> |
diff --git a/drivers/video/pvr2fb.c b/drivers/video/pvr2fb.c index 06805c9b237..6a3d0b57489 100644 --- a/drivers/video/pvr2fb.c +++ b/drivers/video/pvr2fb.c | |||
@@ -72,7 +72,7 @@ | |||
72 | #endif | 72 | #endif |
73 | 73 | ||
74 | #ifdef CONFIG_SH_STORE_QUEUES | 74 | #ifdef CONFIG_SH_STORE_QUEUES |
75 | #include <asm/uaccess.h> | 75 | #include <linux/uaccess.h> |
76 | #include <asm/cpu/sq.h> | 76 | #include <asm/cpu/sq.h> |
77 | #endif | 77 | #endif |
78 | 78 | ||
diff --git a/drivers/video/pxafb.c b/drivers/video/pxafb.c index bfeb54ad3f0..10f912df2da 100644 --- a/drivers/video/pxafb.c +++ b/drivers/video/pxafb.c | |||
@@ -43,7 +43,6 @@ | |||
43 | #include <asm/hardware.h> | 43 | #include <asm/hardware.h> |
44 | #include <asm/io.h> | 44 | #include <asm/io.h> |
45 | #include <asm/irq.h> | 45 | #include <asm/irq.h> |
46 | #include <asm/uaccess.h> | ||
47 | #include <asm/div64.h> | 46 | #include <asm/div64.h> |
48 | #include <asm/arch/pxa-regs.h> | 47 | #include <asm/arch/pxa-regs.h> |
49 | #include <asm/arch/bitfield.h> | 48 | #include <asm/arch/bitfield.h> |
diff --git a/drivers/video/sa1100fb.c b/drivers/video/sa1100fb.c index 5d2a4a4b731..ab2b2110478 100644 --- a/drivers/video/sa1100fb.c +++ b/drivers/video/sa1100fb.c | |||
@@ -178,7 +178,6 @@ | |||
178 | #include <asm/hardware.h> | 178 | #include <asm/hardware.h> |
179 | #include <asm/io.h> | 179 | #include <asm/io.h> |
180 | #include <asm/mach-types.h> | 180 | #include <asm/mach-types.h> |
181 | #include <asm/uaccess.h> | ||
182 | #include <asm/arch/assabet.h> | 181 | #include <asm/arch/assabet.h> |
183 | #include <asm/arch/shannon.h> | 182 | #include <asm/arch/shannon.h> |
184 | 183 | ||
diff --git a/drivers/video/savage/savagefb_driver.c b/drivers/video/savage/savagefb_driver.c index b855f4a34af..37b135d5d12 100644 --- a/drivers/video/savage/savagefb_driver.c +++ b/drivers/video/savage/savagefb_driver.c | |||
@@ -57,7 +57,6 @@ | |||
57 | #include <asm/irq.h> | 57 | #include <asm/irq.h> |
58 | #include <asm/pgtable.h> | 58 | #include <asm/pgtable.h> |
59 | #include <asm/system.h> | 59 | #include <asm/system.h> |
60 | #include <asm/uaccess.h> | ||
61 | 60 | ||
62 | #ifdef CONFIG_MTRR | 61 | #ifdef CONFIG_MTRR |
63 | #include <asm/mtrr.h> | 62 | #include <asm/mtrr.h> |
diff --git a/drivers/video/sis/sis_main.c b/drivers/video/sis/sis_main.c index e8ccace0125..bc7d2368373 100644 --- a/drivers/video/sis/sis_main.c +++ b/drivers/video/sis/sis_main.c | |||
@@ -58,7 +58,7 @@ | |||
58 | #include <linux/capability.h> | 58 | #include <linux/capability.h> |
59 | #include <linux/fs.h> | 59 | #include <linux/fs.h> |
60 | #include <linux/types.h> | 60 | #include <linux/types.h> |
61 | #include <asm/uaccess.h> | 61 | #include <linux/uaccess.h> |
62 | #include <asm/io.h> | 62 | #include <asm/io.h> |
63 | #ifdef CONFIG_MTRR | 63 | #ifdef CONFIG_MTRR |
64 | #include <asm/mtrr.h> | 64 | #include <asm/mtrr.h> |
diff --git a/drivers/video/sstfb.c b/drivers/video/sstfb.c index 5eff28ce4f4..97784f9c184 100644 --- a/drivers/video/sstfb.c +++ b/drivers/video/sstfb.c | |||
@@ -88,7 +88,7 @@ | |||
88 | #include <linux/init.h> | 88 | #include <linux/init.h> |
89 | #include <linux/slab.h> | 89 | #include <linux/slab.h> |
90 | #include <asm/io.h> | 90 | #include <asm/io.h> |
91 | #include <asm/uaccess.h> | 91 | #include <linux/uaccess.h> |
92 | #include <video/sstfb.h> | 92 | #include <video/sstfb.h> |
93 | 93 | ||
94 | 94 | ||
diff --git a/drivers/video/vermilion/vermilion.c b/drivers/video/vermilion/vermilion.c index de531c90771..ff9e805c43b 100644 --- a/drivers/video/vermilion/vermilion.c +++ b/drivers/video/vermilion/vermilion.c | |||
@@ -39,7 +39,6 @@ | |||
39 | #include <asm/cacheflush.h> | 39 | #include <asm/cacheflush.h> |
40 | #include <asm/tlbflush.h> | 40 | #include <asm/tlbflush.h> |
41 | #include <linux/mmzone.h> | 41 | #include <linux/mmzone.h> |
42 | #include <asm/uaccess.h> | ||
43 | 42 | ||
44 | /* #define VERMILION_DEBUG */ | 43 | /* #define VERMILION_DEBUG */ |
45 | 44 | ||
diff --git a/drivers/video/vfb.c b/drivers/video/vfb.c index 64ee78c3c12..02cfc6a45b0 100644 --- a/drivers/video/vfb.c +++ b/drivers/video/vfb.c | |||
@@ -21,7 +21,6 @@ | |||
21 | #include <linux/interrupt.h> | 21 | #include <linux/interrupt.h> |
22 | #include <linux/platform_device.h> | 22 | #include <linux/platform_device.h> |
23 | 23 | ||
24 | #include <asm/uaccess.h> | ||
25 | #include <linux/fb.h> | 24 | #include <linux/fb.h> |
26 | #include <linux/init.h> | 25 | #include <linux/init.h> |
27 | 26 | ||