diff options
| author |   Jesper Juhl <jj@chaosbits.net> | 2010-10-30 15:32:32 +0200 |
|---|---|---|
| committer |   Jiri Kosina <jkosina@suse.cz> | 2010-10-30 22:17:08 +0200 |
| commit | bf01ca1b35ff26a4c16c22b9ce7554f0d3a45ba7 (patch) | |
| tree | 662eeb801b70e999ab9b9599530646d4c3988a24 | |
| parent | Merge branch 'master' into for-next (diff) | |
| download | linux-dev-bf01ca1b35ff26a4c16c22b9ce7554f0d3a45ba7.tar.xz linux-dev-bf01ca1b35ff26a4c16c22b9ce7554f0d3a45ba7.zip | |
VIA Chrome camera: remove duplicate includes
The VIA Chrome integrated camera controller driver includes both 'linux/pci.h'
and 'linux/device.h' twice. This gets rid of the duplicates.
Signed-off-by: Jesper Juhl <jj@chaosbits.net>
Acked-by: Jonathan Corbet <corbet@lwn.net>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
| -rw-r--r-- | drivers/media/video/via-camera.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/media/video/via-camera.c b/drivers/media/video/via-camera.c index 02a21bccae18..6f52818d5917 100644 --- a/drivers/media/video/via-camera.c +++ b/drivers/media/video/via-camera.c @@ -13,14 +13,12 @@ #include <linux/pci.h> #include <linux/gpio.h> #include <linux/interrupt.h> -#include <linux/pci.h> #include <linux/platform_device.h> #include <linux/videodev2.h> #include <media/v4l2-device.h> #include <media/v4l2-ioctl.h> #include <media/v4l2-chip-ident.h> #include <media/videobuf-dma-sg.h> -#include <linux/device.h> #include <linux/delay.h> #include <linux/dma-mapping.h> #include <linux/pm_qos_params.h> |