From 18982296c750b8bd433669adb28134d645e68932 Mon Sep 17 00:00:00 2001
From: florian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Mon, 5 Mar 2012 13:29:54 +0000
Subject: Merge branch 'bcm63xx'

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@30819 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 target/linux/brcm63xx/patches-3.1/100-reset_buttons.patch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'target/linux/brcm63xx/patches-3.1/100-reset_buttons.patch')

diff --git a/target/linux/brcm63xx/patches-3.1/100-reset_buttons.patch b/target/linux/brcm63xx/patches-3.1/100-reset_buttons.patch
index f1f69f421..ac61812f7 100644
--- a/target/linux/brcm63xx/patches-3.1/100-reset_buttons.patch
+++ b/target/linux/brcm63xx/patches-3.1/100-reset_buttons.patch
@@ -92,7 +92,7 @@
  	struct gpio_led leds[5];
 +
 +	/* Buttons */
-+	struct gpio_button buttons[2];
++	struct gpio_button buttons[4];
  };
  
  #endif /* ! BOARD_BCM963XX_H_ */
-- 
cgit v1.2.3