AA: atheros: backport r36513

SVN-Revision: 36514

diff --git a/target/linux/atheros/Makefile b/target/linux/atheros/Makefile
index ce2a90dc9698311f5d3db7813a0e5e443b166cfb..7125f24550ef657d5b590f9b1d45be590f0de731 100644 (file)
--- a/target/linux/atheros/Makefile
+++ b/target/linux/atheros/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2006-2011 OpenWrt.org
+# Copyright (C) 2006-2013 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -15,7 +15,7 @@ LINUX_VERSION:=3.3.8
 
 include $(INCLUDE_DIR)/target.mk
 
-DEFAULT_PACKAGES += wpad-mini kmod-ath5k gpioctl swconfig
+DEFAULT_PACKAGES += wpad-mini kmod-ath5k swconfig kmod-gpio-button-hotplug
 
 define Target/Description
        Build firmware images for Atheros SoC boards

diff --git a/target/linux/atheros/patches-3.3/100-board.patch b/target/linux/atheros/patches-3.3/100-board.patch
index aaa4d4193aaf0ec66daee216b0b00d7012cf2620..f51a59b760f9f1596e544cdd7eef45d6925bcf34 100644 (file)
--- a/target/linux/atheros/patches-3.3/100-board.patch
+++ b/target/linux/atheros/patches-3.3/100-board.patch
@@ -2106,7 +2106,7 @@
 +
 --- /dev/null
 +++ b/arch/mips/ar231x/ar2315.c
-@@ -0,0 +1,694 @@
+@@ -0,0 +1,692 @@
 +/*
 + * This file is subject to the terms and conditions of the GNU General Public
 + * License.  See the file "COPYING" in the main directory of this archive
@@ -2789,8 +2789,6 @@
 +      if (!is_2315())
 +              return;
 +
-+      gpio_request(AR2315_RESET_GPIO, "reset");
-+
 +      /* Clear any lingering AHB errors */
 +      config = read_c0_config();
 +      write_c0_config(config & ~0x3);