diff options
| author | Sachin Kamat <sachin.kamat@linaro.org> | 2011-07-19 14:37:07 +0530 |
|---|---|---|
| committer | Angus Ainslie <angus.ainslie@linaro.org> | 2011-08-18 17:15:35 -0600 |
| commit | d0c2b5e71cbbe2c233e1fce801a26e06bec2e04f (patch) | |
| tree | f96ffd5b7ad606eee97981a77990196dca81b174 | |
| parent | 46903f5a87fd17f41e96f22d20676d2846a24c89 (diff) | |
Samsung] Clean-up: Removed duplicate include files for non-mainlined Samsung code.
Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Conflicts:
drivers/media/video/s5p-tvout/hw_if/cec.c
Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
| -rw-r--r-- | drivers/input/misc/origen_button.c | 4 | ||||
| -rw-r--r-- | drivers/media/video/samsung/jpeg/jpeg_dev.c | 1 | ||||
| -rw-r--r-- | drivers/video/samsung/s3cfb_ops.c | 1 |
3 files changed, 0 insertions, 6 deletions
diff --git a/drivers/input/misc/origen_button.c b/drivers/input/misc/origen_button.c index 14b6824abe6c..fa8fe22078de 100644 --- a/drivers/input/misc/origen_button.c +++ b/drivers/input/misc/origen_button.c @@ -15,11 +15,7 @@ #include <linux/irq.h> #include <linux/slab.h> #include <linux/platform_device.h> - #include <linux/gpio.h> -#include <linux/interrupt.h> -#include <linux/irq.h> - #include <plat/map-base.h> #include <plat/gpio-cfg.h> #include <plat/button.h> diff --git a/drivers/media/video/samsung/jpeg/jpeg_dev.c b/drivers/media/video/samsung/jpeg/jpeg_dev.c index e1683d8cad0c..35e4c0a69fa4 100644 --- a/drivers/media/video/samsung/jpeg/jpeg_dev.c +++ b/drivers/media/video/samsung/jpeg/jpeg_dev.c @@ -30,7 +30,6 @@ #include <linux/time.h> #include <linux/clk.h> #include <linux/semaphore.h> -#include <linux/vmalloc.h> #include <linux/sched.h> #include <asm/page.h> diff --git a/drivers/video/samsung/s3cfb_ops.c b/drivers/video/samsung/s3cfb_ops.c index 5553d23fbdb6..d53fe44bcc5b 100644 --- a/drivers/video/samsung/s3cfb_ops.c +++ b/drivers/video/samsung/s3cfb_ops.c @@ -13,7 +13,6 @@ #include <linux/poll.h> #include <linux/dma-mapping.h> #include <linux/platform_device.h> -#include <linux/dma-mapping.h> #include <asm/cacheflush.h> #include "s3cfb.h" |