Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6

[pandora-kernel.git] / arch / arm / mach-mx25 / devices.c

diff --git a/arch/arm/mach-mx25/devices.c b/arch/arm/mach-mx25/devices.c
index 3468eb1..1d0eb3e 100644 (file)
--- a/arch/arm/mach-mx25/devices.c
+++ b/arch/arm/mach-mx25/devices.c
@@ -208,26 +208,6 @@ int __init imx25_register_gpios(void)
        return mxc_gpio_init(imx_gpio_ports, ARRAY_SIZE(imx_gpio_ports));
 }
 
-static struct resource mx25_fec_resources[] = {
-       {
-               .start  = MX25_FEC_BASE_ADDR,
-               .end    = MX25_FEC_BASE_ADDR + 0xfff,
-               .flags  = IORESOURCE_MEM,
-       },
-       {
-               .start  = MX25_INT_FEC,
-               .end    = MX25_INT_FEC,
-               .flags  = IORESOURCE_IRQ,
-       },
-};
-
-struct platform_device mx25_fec_device = {
-       .name   = "fec",
-       .id     = 0,
-       .num_resources  = ARRAY_SIZE(mx25_fec_resources),
-       .resource       = mx25_fec_resources,
-};
-
 static struct resource mx25_rtc_resources[] = {
        {
                .start  = MX25_DRYICE_BASE_ADDR,
@@ -305,44 +285,6 @@ struct platform_device mx25_kpp_device = {
        .resource       = mx25_kpp_resources,
 };
 
-static struct resource imx_ssi_resources0[] = {
-       {
-               .start  = MX25_SSI1_BASE_ADDR,
-               .end    = MX25_SSI1_BASE_ADDR + 0x3fff,
-               .flags  = IORESOURCE_MEM,
-       }, {
-               .start  = MX25_INT_SSI1,
-               .end    = MX25_INT_SSI1,
-               .flags  = IORESOURCE_IRQ,
-       },
-};
-
-static struct resource imx_ssi_resources1[] = {
-       {
-               .start  = MX25_SSI2_BASE_ADDR,
-               .end    = MX25_SSI2_BASE_ADDR + 0x3fff,
-               .flags  = IORESOURCE_MEM
-       }, {
-               .start  = MX25_INT_SSI2,
-               .end    = MX25_INT_SSI2,
-               .flags  = IORESOURCE_IRQ,
-       },
-};
-
-struct platform_device imx_ssi_device0 = {
-       .name = "imx-ssi",
-       .id = 0,
-       .num_resources = ARRAY_SIZE(imx_ssi_resources0),
-       .resource = imx_ssi_resources0,
-};
-
-struct platform_device imx_ssi_device1 = {
-       .name = "imx-ssi",
-       .id = 1,
-       .num_resources = ARRAY_SIZE(imx_ssi_resources1),
-       .resource = imx_ssi_resources1,
-};
-
 static struct resource mx25_csi_resources[] = {
        {
                .start  = MX25_CSI_BASE_ADDR,