diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /drivers/video/omap/lcd_omap3beagle.c | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'drivers/video/omap/lcd_omap3beagle.c')
| -rw-r--r-- | drivers/video/omap/lcd_omap3beagle.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/video/omap/lcd_omap3beagle.c b/drivers/video/omap/lcd_omap3beagle.c index ca75cc2a87a5..d7c6c3e0afc6 100644 --- a/drivers/video/omap/lcd_omap3beagle.c +++ b/drivers/video/omap/lcd_omap3beagle.c | |||
| @@ -25,8 +25,6 @@ | |||
| 25 | #include <linux/gpio.h> | 25 | #include <linux/gpio.h> |
| 26 | #include <linux/i2c/twl.h> | 26 | #include <linux/i2c/twl.h> |
| 27 | 27 | ||
| 28 | #include <plat/mux.h> | ||
| 29 | #include <plat/mux.h> | ||
| 30 | #include <asm/mach-types.h> | 28 | #include <asm/mach-types.h> |
| 31 | 29 | ||
| 32 | #include "omapfb.h" | 30 | #include "omapfb.h" |