[backfire] merge r23043

git-svn-id: svn://svn.openwrt.org/openwrt/branches/backfire@23044 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/package/broadcom-diag/Makefile b/package/broadcom-diag/Makefile
index 9cb77cdf31f9e5aa78154ca31833bc763811c90c..06e90afc06f40393b8e247cd0b9cd8908945a855 100644 (file)
--- a/package/broadcom-diag/Makefile
+++ b/package/broadcom-diag/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=broadcom-diag
-PKG_RELEASE:=7
+PKG_RELEASE:=7.1
 
 include $(INCLUDE_DIR)/package.mk
 

diff --git a/package/broadcom-diag/src/diag.c b/package/broadcom-diag/src/diag.c
index 4ee734b7d7c0588dc46b96ce0a705599efe907a6..3fa12f92e5b355ed0ec06cb281cde626bc4a3bf3 100644 (file)
--- a/package/broadcom-diag/src/diag.c
+++ b/package/broadcom-diag/src/diag.c
@@ -767,8 +767,7 @@ static struct platform_t __initdata platforms[] = {
        [STI_NAS] = {
                .name      = "SimpleTech SimpleShare NAS",
                .buttons        = {
-                       { .name = "reset",      .gpio = 1 << 7 }, // on back, hardwired, always resets device regardless OS state
-                       { .name = "power",      .gpio = 1 << 0 }, // on back
+                       { .name = "reset",      .gpio = 1 << 0 }, // Power button on back, named reset to enable failsafe.
                },
                .leds      = {
                        { .name = "diag",       .gpio = 1 << 1, .polarity = REVERSE }, // actual name ready