Skip to content

Commit cfbaf4d

Browse files
ericmiaoMauro Carvalho Chehab
authored and
Mauro Carvalho Chehab
committed
V4L/DVB (10176b): pxa-camera: fix redefinition warnings and missing DMA definitions
1. now pxa_camera.c uses ioremap() for register access, pxa_camera.h is totally useless. Remove it. 2. <asm/dma.h> does no longer include <mach/dma.h>, include the latter file explicitly delete mode 100644 drivers/media/video/pxa_camera.h Signed-off-by: Eric Miao <[email protected]> Signed-off-by: Mauro Carvalho Chehab <[email protected]>
1 parent c0cd501 commit cfbaf4d

File tree

2 files changed

+1
-98
lines changed

2 files changed

+1
-98
lines changed

drivers/media/video/pxa_camera.c

+1-3
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,10 @@
3434

3535
#include <linux/videodev2.h>
3636

37-
#include <asm/dma.h>
37+
#include <mach/dma.h>
3838
#include <mach/pxa-regs.h>
3939
#include <mach/camera.h>
4040

41-
#include "pxa_camera.h"
42-
4341
#define PXA_CAM_VERSION_CODE KERNEL_VERSION(0, 0, 5)
4442
#define PXA_CAM_DRV_NAME "pxa27x-camera"
4543

drivers/media/video/pxa_camera.h

-95
This file was deleted.

0 commit comments

Comments
 (0)