diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-03-11 10:29:28 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-03-11 10:29:28 +0100 |
| commit | 1d8ce7bc4d05b4a5c04dc17f92fef26989fb5935 (patch) | |
| tree | 12df0f2e25e95654156b2900bd6df1abb3c2e87a /arch/sh | |
| parent | 3a450de1365d20afde406f0d9b2931a5e4a4fd6a (diff) | |
| parent | 16b71fdf97599f1b1b7f38418ee9922d9f117396 (diff) | |
Merge branch 'linus' into core/percpu
Conflicts:
arch/x86/include/asm/fixmap_64.h
Diffstat (limited to 'arch/sh')
| -rw-r--r-- | arch/sh/boards/board-ap325rxa.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/sh/boards/board-ap325rxa.c b/arch/sh/boards/board-ap325rxa.c index 72da416f616..15b6d450fbf 100644 --- a/arch/sh/boards/board-ap325rxa.c +++ b/arch/sh/boards/board-ap325rxa.c @@ -22,6 +22,7 @@ #include <linux/gpio.h> #include <linux/spi/spi.h> #include <linux/spi/spi_gpio.h> +#include <media/soc_camera.h> #include <media/soc_camera_platform.h> #include <media/sh_mobile_ceu.h> #include <video/sh_mobile_lcdc.h> |