Merge branch 'async-scsi-resume' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux.git] / arch / arm / mach-sa1100 / h3600.c

diff --git a/arch/arm/mach-sa1100/h3600.c b/arch/arm/mach-sa1100/h3600.c
index a663e723014142e2fb5fabfb81508e310e0c4c52..5be54c214c7c731f1a3f343fc8e0c83920c003a1 100644 (file)
--- a/arch/arm/mach-sa1100/h3600.c
+++ b/arch/arm/mach-sa1100/h3600.c
@@ -130,15 +130,8 @@ static struct irda_platform_data h3600_irda_data = {
        .shutdown       = h3600_irda_shutdown,
 };
 
-static struct gpio_default_state h3600_default_gpio[] = {
-       { H3XXX_GPIO_COM_DCD,   GPIO_MODE_IN,   "COM DCD" },
-       { H3XXX_GPIO_COM_CTS,   GPIO_MODE_IN,   "COM CTS" },
-       { H3XXX_GPIO_COM_RTS,   GPIO_MODE_OUT0, "COM RTS" },
-};
-
 static void __init h3600_mach_init(void)
 {
-       h3xxx_init_gpio(h3600_default_gpio, ARRAY_SIZE(h3600_default_gpio));
        h3xxx_mach_init();
 
        sa11x0_register_lcd(&h3600_lcd_info);