From cbb85868ffbfc639ce64a449bc560a980db17319 Mon Sep 17 00:00:00 2001
From: Florian Fainelli <florian@openwrt.org>
Date: Fri, 22 Aug 2008 17:01:31 +0200
Subject: [PATCH] --- yaml --- r: 111109 b: refs/heads/master c:
 49afa0a15180c22c8836ef36edd6aa48ab7b2915 h: refs/heads/master i:   111107:
 de738e02236ec2870f89befc53d288b1d272dbc7 v: v3

---
 [refs]                                     |  2 +-
 trunk/arch/mips/rb532/prom.c               | 10 ----------
 trunk/include/asm-mips/mach-rc32434/prom.h |  4 ----
 3 files changed, 1 insertion(+), 15 deletions(-)

diff --git a/[refs] b/[refs]
index 4b58e4eb9ca7..43008660c5cd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3c8cf8caa5b217fbb17d0dce7f6bbec1d7da7249
+refs/heads/master: 49afa0a15180c22c8836ef36edd6aa48ab7b2915
diff --git a/trunk/arch/mips/rb532/prom.c b/trunk/arch/mips/rb532/prom.c
index 1bc0af8febf4..c5d8868e1b15 100644
--- a/trunk/arch/mips/rb532/prom.c
+++ b/trunk/arch/mips/rb532/prom.c
@@ -41,8 +41,6 @@ extern void __init setup_serial_port(void);
 
 unsigned int idt_cpu_freq = 132000000;
 EXPORT_SYMBOL(idt_cpu_freq);
-unsigned int gpio_bootup_state;
-EXPORT_SYMBOL(gpio_bootup_state);
 
 static struct resource ddr_reg[] = {
 	{
@@ -108,9 +106,6 @@ void __init prom_setup_cmdline(void)
 				mips_machtype = MACH_MIKROTIK_RB532;
 		}
 
-		if (match_tag(prom_argv[i], GPIO_TAG))
-			gpio_bootup_state = tag2ul(prom_argv[i], GPIO_TAG);
-
 		strcpy(cp, prom_argv[i]);
 		cp += strlen(prom_argv[i]);
 	}
@@ -122,11 +117,6 @@ void __init prom_setup_cmdline(void)
 		strcpy(cp, arcs_cmdline);
 		cp += strlen(arcs_cmdline);
 	}
-	if (gpio_bootup_state & 0x02)
-		strcpy(cp, GPIO_INIT_NOBUTTON);
-	else
-		strcpy(cp, GPIO_INIT_BUTTON);
-
 	cmd_line[CL_SIZE-1] = '\0';
 
 	strcpy(arcs_cmdline, cmd_line);
diff --git a/trunk/include/asm-mips/mach-rc32434/prom.h b/trunk/include/asm-mips/mach-rc32434/prom.h
index 1d66ddcda89a..660707f1bcce 100644
--- a/trunk/include/asm-mips/mach-rc32434/prom.h
+++ b/trunk/include/asm-mips/mach-rc32434/prom.h
@@ -28,14 +28,10 @@
 
 #define PROM_ENTRY(x)		(0xbfc00000 + ((x) * 8))
 
-#define GPIO_INIT_NOBUTTON	""
-#define GPIO_INIT_BUTTON	" 2"
-
 #define SR_NMI			0x00180000
 #define SERIAL_SPEED_ENTRY	0x00000001
 
 #define FREQ_TAG		"HZ="
-#define GPIO_TAG		"gpio="
 #define KMAC_TAG		"kmac="
 #define MEM_TAG			"mem="
 #define BOARD_TAG		"board="