[pkg-fso-commits] [SCM] linux-2.6-openmoko, the Linux 2.6 kernel tree from Openmoko branch, andy-tracking, updated. upstream/20090303.gitb9de904e-140-g23b564c

[Andy Green]

The following commit has been merged in the andy-tracking branch:
commit 8bbe6c423b04238764e04885ad78450a1d43cb07
Author: Werner Almesberger <werner at openmoko.org>
Date:   Thu Mar 5 14:40:08 2009 +0000

    Add camera interface driver to 3D7K
    
    This patch adds the camera interface driver and the corresponding
    configuration option to the 3D7K machine.
    
    Signed-off-by: Werner Almesberger <werner at openmoko.org>

diff --git a/arch/arm/mach-s3c6410/Kconfig b/arch/arm/mach-s3c6410/Kconfig
index bbe158a..373ce9c 100644
--- a/arch/arm/mach-s3c6410/Kconfig
+++ b/arch/arm/mach-s3c6410/Kconfig
@@ -70,6 +70,7 @@ config MACH_OM_3D7K
 	select S3C6410_SETUP_SDHCI
 	select S3C64XX_SETUP_I2C1
 	select S3C_DEV_FB
+	select S3C_DEV_CAMIF
 	select S3C64XX_SETUP_FB_24BPP
 #	select SENSORS_PCF50633
 	select POWER_SUPPLY
diff --git a/arch/arm/mach-s3c6410/mach-om-3d7k.c b/arch/arm/mach-s3c6410/mach-om-3d7k.c
index 628f2af..2dccffd 100644
--- a/arch/arm/mach-s3c6410/mach-om-3d7k.c
+++ b/arch/arm/mach-s3c6410/mach-om-3d7k.c
@@ -84,6 +84,8 @@
 #include <plat/regs-usb-hs-otg.h>
 
 extern struct platform_device s3c_device_usbgadget;
+extern struct platform_device s3c_device_camif; /* @@@ change plat/devs.h */
+
 
 /* -------------------------------------------------------------------------------
  * OM_3D7K FIQ related
@@ -962,6 +964,7 @@ static struct platform_device *om_3d7k_devices[] __initdata = {
 	&om_3d7k_device_spi_lcm,
 	&s3c_device_usbgadget,
 	&s3c24xx_pwm_device,
+	&s3c_device_camif,
 };
 
 

-- 
linux-2.6-openmoko, the Linux 2.6 kernel tree from Openmoko