[backfire] base-files, target: merge r28750 and r28933

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

diff --git a/package/base-files/files/etc/config/system b/package/base-files/files/etc/config/system
index ad51db5..314f291 100644 (file)
--- a/package/base-files/files/etc/config/system
+++ b/package/base-files/files/etc/config/system
@@ -2,7 +2,7 @@ config system
        option hostname OpenWrt
        option timezone UTC
 
-config timeserver
+config timeserver ntp
        list server     0.openwrt.pool.ntp.org
        list server     1.openwrt.pool.ntp.org
        list server     2.openwrt.pool.ntp.org

diff --git a/target/linux/atheros/base-files/etc/config/system b/target/linux/atheros/base-files/etc/config/system
index 47faa3c..1d29ad8 100644 (file)
--- a/target/linux/atheros/base-files/etc/config/system
+++ b/target/linux/atheros/base-files/etc/config/system
@@ -2,6 +2,12 @@ config system
        option hostname OpenWrt
        option timezone UTC
 
+config timeserver ntp
+       list server     0.openwrt.pool.ntp.org
+       list server     1.openwrt.pool.ntp.org
+       list server     2.openwrt.pool.ntp.org
+       list server     3.openwrt.pool.ntp.org
+
 config button
        option button   reset
        option action   released