diff options
| author | Roman Yeryomin <roman@advem.lv> | 2013-05-26 01:02:55 +0300 |
|---|---|---|
| committer | Roman Yeryomin <roman@advem.lv> | 2013-05-26 01:02:55 +0300 |
| commit | 342045a35b1981a89e4bc80842b10c065e1050da (patch) | |
| tree | 4140720b20e8d641c11da882010d6130a75fef21 /target/linux/brcm63xx/base-files/lib/preinit/05_reset_button_brcm63xx | |
| parent | 7338133dde8238afce34676214b494c8db96689b (diff) | |
| parent | 1a116ce7818ecee5d167a9c0ebb1a0feca9120e6 (diff) | |
Merge trunk into realtek-unstable
Conflicts:
Config.in
feeds.conf.default
package/base-files/files/etc/hotplug2-common.rules
package/network/config/netifd/files/etc/init.d/network
Diffstat (limited to 'target/linux/brcm63xx/base-files/lib/preinit/05_reset_button_brcm63xx')
| -rw-r--r-- | target/linux/brcm63xx/base-files/lib/preinit/05_reset_button_brcm63xx | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/target/linux/brcm63xx/base-files/lib/preinit/05_reset_button_brcm63xx b/target/linux/brcm63xx/base-files/lib/preinit/05_reset_button_brcm63xx index f6bfbdec3..0dfca73c2 100644 --- a/target/linux/brcm63xx/base-files/lib/preinit/05_reset_button_brcm63xx +++ b/target/linux/brcm63xx/base-files/lib/preinit/05_reset_button_brcm63xx @@ -1,7 +1,5 @@ #!/bin/sh -. /lib/brcm63xx.sh - enable_reset_button() { if [ "$brcm63xx_has_reset_button" = "true" ]; then insmod input-core |