From 5eec75291a71896f9f2e5af9a8d07ec8117c79c8 Mon Sep 17 00:00:00 2001 From: jow Date: Mon, 13 Sep 2010 01:38:46 +0000 Subject: [PATCH] [backfire] merge r23043 git-svn-id: svn://svn.openwrt.org/openwrt/branches/backfire@23044 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/broadcom-diag/Makefile | 2 +- package/broadcom-diag/src/diag.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/package/broadcom-diag/Makefile b/package/broadcom-diag/Makefile index 9cb77cdf3..06e90afc0 100644 --- 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 4ee734b7d..3fa12f92e 100644 --- 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