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

fbdev: omap: avoid using mach/*.h files

All the headers we actually need are now in include/linux/soc,
so use those versions instead and allow compile-testing on
other architectures.

Acked-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Acked-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>

Arnd Bergmann 804f7f19 d87d44f7

+16 -13
+2 -2
drivers/video/backlight/Kconfig
··· 211 211 212 212 config BACKLIGHT_OMAP1 213 213 tristate "OMAP1 PWL-based LCD Backlight" 214 - depends on ARCH_OMAP1 215 - default y 214 + depends on ARCH_OMAP1 || COMPILE_TEST 215 + default ARCH_OMAP1 216 216 help 217 217 This driver controls the LCD backlight level and power for 218 218 the PWL module of OMAP1 processors. Say Y if your board
+2 -2
drivers/video/backlight/omap1_bl.c
··· 14 14 #include <linux/slab.h> 15 15 #include <linux/platform_data/omap1_bl.h> 16 16 17 - #include <mach/hardware.h> 18 - #include <mach/mux.h> 17 + #include <linux/soc/ti/omap1-io.h> 18 + #include <linux/soc/ti/omap1-mux.h> 19 19 20 20 #define OMAPBL_MAX_INTENSITY 0xff 21 21
+2 -2
drivers/video/fbdev/omap/Kconfig
··· 2 2 config FB_OMAP 3 3 tristate "OMAP frame buffer support" 4 4 depends on FB 5 - depends on ARCH_OMAP1 5 + depends on ARCH_OMAP1 || (ARM && COMPILE_TEST) 6 6 select FB_CFB_FILLRECT 7 7 select FB_CFB_COPYAREA 8 8 select FB_CFB_IMAGEBLIT ··· 42 42 43 43 config FB_OMAP_LCD_H3 44 44 bool "TPS65010 LCD controller on OMAP-H3" 45 - depends on MACH_OMAP_H3 45 + depends on MACH_OMAP_H3 || COMPILE_TEST 46 46 depends on TPS65010=y 47 47 default y 48 48 help
+1 -1
drivers/video/fbdev/omap/lcd_ams_delta.c
··· 14 14 #include <linux/gpio/consumer.h> 15 15 #include <linux/lcd.h> 16 16 17 - #include <mach/hardware.h> 17 + #include <linux/soc/ti/omap1-io.h> 18 18 19 19 #include "omapfb.h" 20 20
+2 -1
drivers/video/fbdev/omap/lcd_dma.c
··· 25 25 26 26 #include <linux/omap-dma.h> 27 27 28 - #include <mach/hardware.h> 28 + #include <linux/soc/ti/omap1-soc.h> 29 + #include <linux/soc/ti/omap1-io.h> 29 30 30 31 #include "lcdc.h" 31 32 #include "lcd_dma.h"
+1 -1
drivers/video/fbdev/omap/lcd_inn1510.c
··· 10 10 #include <linux/platform_device.h> 11 11 #include <linux/io.h> 12 12 13 - #include <mach/hardware.h> 13 + #include <linux/soc/ti/omap1-soc.h> 14 14 15 15 #include "omapfb.h" 16 16
+2 -2
drivers/video/fbdev/omap/lcd_osk.c
··· 11 11 #include <linux/platform_device.h> 12 12 #include <linux/gpio.h> 13 13 14 - #include <mach/hardware.h> 15 - #include <mach/mux.h> 14 + #include <linux/soc/ti/omap1-io.h> 15 + #include <linux/soc/ti/omap1-mux.h> 16 16 17 17 #include "omapfb.h" 18 18
+2
drivers/video/fbdev/omap/lcdc.c
··· 17 17 #include <linux/clk.h> 18 18 #include <linux/gfp.h> 19 19 20 + #include <linux/soc/ti/omap1-io.h> 21 + #include <linux/soc/ti/omap1-soc.h> 20 22 #include <linux/omap-dma.h> 21 23 22 24 #include <asm/mach-types.h>
+1 -2
drivers/video/fbdev/omap/omapfb_main.c
··· 20 20 21 21 #include <linux/omap-dma.h> 22 22 23 - #include <mach/hardware.h> 24 - 23 + #include <linux/soc/ti/omap1-soc.h> 25 24 #include "omapfb.h" 26 25 #include "lcdc.h" 27 26
+1
drivers/video/fbdev/omap/sossi.c
··· 13 13 #include <linux/interrupt.h> 14 14 15 15 #include <linux/omap-dma.h> 16 + #include <linux/soc/ti/omap1-io.h> 16 17 17 18 #include "omapfb.h" 18 19 #include "lcd_dma.h"