aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJo-Philipp Wich <jow@openwrt.org>2012-02-27 09:33:36 +0000
committerJo-Philipp Wich <jow@openwrt.org>2012-02-27 09:33:36 +0000
commit47b27500cfe392361428d2386dd30a08ac7a3b51 (patch)
treed8d341cdd5f77ad5edb6d7026b48a99841205db3
parent72599f0c610cf73c91b2fa589d084ef44a4a4d00 (diff)
downloadupstream-47b27500cfe392361428d2386dd30a08ac7a3b51.tar.gz
upstream-47b27500cfe392361428d2386dd30a08ac7a3b51.tar.bz2
upstream-47b27500cfe392361428d2386dd30a08ac7a3b51.zip
partly revert r30708, it breaks various arches
SVN-Revision: 30737
-rw-r--r--target/linux/generic/config-3.01
-rw-r--r--target/linux/generic/config-3.11
-rw-r--r--target/linux/generic/config-3.21
-rw-r--r--target/linux/generic/config-3.31
-rw-r--r--target/linux/generic/files/drivers/net/phy/rtl8366_smi.c1
5 files changed, 5 insertions, 0 deletions
diff --git a/target/linux/generic/config-3.0 b/target/linux/generic/config-3.0
index 92e5a7f1a0..5bfc3e7937 100644
--- a/target/linux/generic/config-3.0
+++ b/target/linux/generic/config-3.0
@@ -1221,6 +1221,7 @@ CONFIG_LBDAF=y
# CONFIG_LEDS_BD2802 is not set
CONFIG_LEDS_CLASS=y
# CONFIG_LEDS_DAC124S085 is not set
+CONFIG_LEDS_GPIO_PLATFORM=y
# CONFIG_LEDS_INTEL_SS4200 is not set
# CONFIG_LEDS_LM3530 is not set
# CONFIG_LEDS_LP3944 is not set
diff --git a/target/linux/generic/config-3.1 b/target/linux/generic/config-3.1
index 6bee18828f..9b339e7c33 100644
--- a/target/linux/generic/config-3.1
+++ b/target/linux/generic/config-3.1
@@ -1234,6 +1234,7 @@ CONFIG_LBDAF=y
# CONFIG_LEDS_BD2802 is not set
CONFIG_LEDS_CLASS=y
# CONFIG_LEDS_DAC124S085 is not set
+CONFIG_LEDS_GPIO_PLATFORM=y
# CONFIG_LEDS_INTEL_SS4200 is not set
# CONFIG_LEDS_LM3530 is not set
# CONFIG_LEDS_LP3944 is not set
diff --git a/target/linux/generic/config-3.2 b/target/linux/generic/config-3.2
index cce2a675d5..379b167450 100644
--- a/target/linux/generic/config-3.2
+++ b/target/linux/generic/config-3.2
@@ -1254,6 +1254,7 @@ CONFIG_LBDAF=y
# CONFIG_LEDS_BD2802 is not set
CONFIG_LEDS_CLASS=y
# CONFIG_LEDS_DAC124S085 is not set
+CONFIG_LEDS_GPIO_PLATFORM=y
# CONFIG_LEDS_INTEL_SS4200 is not set
# CONFIG_LEDS_LM3530 is not set
# CONFIG_LEDS_LP3944 is not set
diff --git a/target/linux/generic/config-3.3 b/target/linux/generic/config-3.3
index 7c9eddf3d8..f53668dc45 100644
--- a/target/linux/generic/config-3.3
+++ b/target/linux/generic/config-3.3
@@ -1265,6 +1265,7 @@ CONFIG_LBDAF=y
# CONFIG_LEDS_BD2802 is not set
CONFIG_LEDS_CLASS=y
# CONFIG_LEDS_DAC124S085 is not set
+CONFIG_LEDS_GPIO_PLATFORM=y
# CONFIG_LEDS_INTEL_SS4200 is not set
# CONFIG_LEDS_LM3530 is not set
# CONFIG_LEDS_LP3944 is not set
diff --git a/target/linux/generic/files/drivers/net/phy/rtl8366_smi.c b/target/linux/generic/files/drivers/net/phy/rtl8366_smi.c
index e48ca99ce8..c89e5a93b6 100644
--- a/target/linux/generic/files/drivers/net/phy/rtl8366_smi.c
+++ b/target/linux/generic/files/drivers/net/phy/rtl8366_smi.c
@@ -144,6 +144,7 @@ static int rtl8366_smi_wait_for_ack(struct rtl8366_smi *smi)
if (++retry_cnt > RTL8366_SMI_ACK_RETRY_COUNT) {
dev_err(smi->parent, "ACK timeout\n");
+ dump_stack();
return -ETIMEDOUT;
}
} while (1);