diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-12-02 17:07:40 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-12-02 17:07:40 -0500 |
| commit | c5b84b3bb0c055d70dc9f1b5e900378bc9d059ea (patch) | |
| tree | bd5b0b4efb552bacd812f9e6e08a29bae70c0da1 /drivers/media/video/pxa_camera.c | |
| parent | d281bc9d8a22419abc254f86a7fc268bb99914e1 (diff) | |
| parent | bc2fd1c09c226ea47ab8301cde6dbcf9e5c78b73 (diff) | |
Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into devel
Conflicts:
arch/arm/mach-pxa/pxa25x.c
Diffstat (limited to 'drivers/media/video/pxa_camera.c')
| -rw-r--r-- | drivers/media/video/pxa_camera.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/media/video/pxa_camera.c b/drivers/media/video/pxa_camera.c index 6586f0b13363..70a77625107d 100644 --- a/drivers/media/video/pxa_camera.c +++ b/drivers/media/video/pxa_camera.c | |||
| @@ -39,6 +39,8 @@ | |||
| 39 | #include <mach/pxa-regs.h> | 39 | #include <mach/pxa-regs.h> |
| 40 | #include <mach/camera.h> | 40 | #include <mach/camera.h> |
| 41 | 41 | ||
| 42 | #include "pxa_camera.h" | ||
| 43 | |||
| 42 | #define PXA_CAM_VERSION_CODE KERNEL_VERSION(0, 0, 5) | 44 | #define PXA_CAM_VERSION_CODE KERNEL_VERSION(0, 0, 5) |
| 43 | #define PXA_CAM_DRV_NAME "pxa27x-camera" | 45 | #define PXA_CAM_DRV_NAME "pxa27x-camera" |
| 44 | 46 | ||