[generic] partly revert r30708, it breaks various arches

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@30737 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/target/linux/generic/config-3.0 b/target/linux/generic/config-3.0
index 92e5a7f..5bfc3e7 100644 (file)
--- 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_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
 # 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 6bee188..9b339e7 100644 (file)
--- 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_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
 # 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 cce2a67..379b167 100644 (file)
--- 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_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
 # 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 7c9eddf..f53668d 100644 (file)
--- 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_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
 # 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 e48ca99..c89e5a9 100644 (file)
--- 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");
 
                if (++retry_cnt > RTL8366_SMI_ACK_RETRY_COUNT) {
                        dev_err(smi->parent, "ACK timeout\n");

+                       dump_stack();

                        return -ETIMEDOUT;
                }
        } while (1);
                        return -ETIMEDOUT;
                }
        } while (1);