Merge branch 'parisc-5.9-2' of git://git.kernel.org/pub/scm/linux/kernel/git/deller...

[linux-2.6-microblaze.git] / arch / arm / mach-omap1 / devices.c

diff --git a/arch/arm/mach-omap1/devices.c b/arch/arm/mach-omap1/devices.c
index 3c4900a..eb0f09e 100644 (file)
--- a/arch/arm/mach-omap1/devices.c
+++ b/arch/arm/mach-omap1/devices.c
@@ -21,7 +21,6 @@
 #include <mach/mux.h>
 
 #include <mach/omap7xx.h>
-#include "camera.h"
 #include <mach/hardware.h>
 
 #include "common.h"
@@ -258,48 +257,6 @@ static inline void omap_init_spi100k(void)
 }
 #endif
 
-
-#define OMAP1_CAMERA_BASE      0xfffb6800
-#define OMAP1_CAMERA_IOSIZE    0x1c
-
-static struct resource omap1_camera_resources[] = {
-       [0] = {
-               .start  = OMAP1_CAMERA_BASE,
-               .end    = OMAP1_CAMERA_BASE + OMAP1_CAMERA_IOSIZE - 1,
-               .flags  = IORESOURCE_MEM,
-       },
-       [1] = {
-               .start  = INT_CAMERA,
-               .flags  = IORESOURCE_IRQ,
-       },
-};
-
-static u64 omap1_camera_dma_mask = DMA_BIT_MASK(32);
-
-static struct platform_device omap1_camera_device = {
-       .name           = "omap1-camera",
-       .id             = 0, /* This is used to put cameras on this interface */
-       .dev            = {
-               .dma_mask               = &omap1_camera_dma_mask,
-               .coherent_dma_mask      = DMA_BIT_MASK(32),
-       },
-       .num_resources  = ARRAY_SIZE(omap1_camera_resources),
-       .resource       = omap1_camera_resources,
-};
-
-void __init omap1_camera_init(void *info)
-{
-       struct platform_device *dev = &omap1_camera_device;
-       int ret;
-
-       dev->dev.platform_data = info;
-
-       ret = platform_device_register(dev);
-       if (ret)
-               dev_err(&dev->dev, "unable to register device: %d\n", ret);
-}
-
-
 /*-------------------------------------------------------------------------*/
 
 static inline void omap_init_sti(void) {}