This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / arch / arm / mach-pxa / generic.c

diff --git a/arch/arm/mach-pxa/generic.c b/arch/arm/mach-pxa/generic.c
index a45aaa1..3fe0202 100644 (file)
--- a/arch/arm/mach-pxa/generic.c
+++ b/arch/arm/mach-pxa/generic.c
@@ -92,7 +92,7 @@ EXPORT_SYMBOL(pxa_set_cken);
  */
 static struct map_desc standard_io_desc[] __initdata = {
  /* virtual     physical    length      type */
-  { 0xf2000000, 0x40000000, 0x02000000, MT_DEVICE }, /* Devs */
+  { 0xf2000000, 0x40000000, 0x01800000, MT_DEVICE }, /* Devs */
   { 0xf4000000, 0x44000000, 0x00100000, MT_DEVICE }, /* LCD */
   { 0xf6000000, 0x48000000, 0x00100000, MT_DEVICE }, /* Mem Ctl */
   { 0xf8000000, 0x4c000000, 0x00100000, MT_DEVICE }, /* USB host */
@@ -220,30 +220,6 @@ static struct platform_device stuart_device = {
        .id             = 2,
 };
 
-static struct resource i2c_resources[] = {
-       {
-               .start  = 0x40301680,
-               .end    = 0x403016a3,
-               .flags  = IORESOURCE_MEM,
-       }, {
-               .start  = IRQ_I2C,
-               .end    = IRQ_I2C,
-               .flags  = IORESOURCE_IRQ,
-       },
-};
-
-static struct platform_device i2c_device = {
-       .name           = "pxa2xx-i2c",
-       .id             = 0,
-       .resource       = i2c_resources,
-       .num_resources  = ARRAY_SIZE(i2c_resources),
-};
-
-void __init pxa_set_i2c_info(struct i2c_pxa_platform_data *info)
-{
-       i2c_device.dev.platform_data = info;
-}
-
 static struct platform_device *devices[] __initdata = {
        &pxamci_device,
        &udc_device,
@@ -251,7 +227,6 @@ static struct platform_device *devices[] __initdata = {
        &ffuart_device,
        &btuart_device,
        &stuart_device,
-       &i2c_device,
 };
 
 static int __init pxa_init(void)