From: Jo-Philipp Wich <jow@openwrt.org>
Date: Thu, 10 Nov 2011 12:20:47 +0000 (+0000)
Subject: base-files, target: merge r28750 and r28933
X-Git-Tag: backfire_10.03.1~73
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=72f0cbf18eec424147ca7a51b7f0df74cdd1f7c4;p=openwrt%2Fsvn-archive%2Fopenwrt.git

base-files, target: merge r28750 and r28933

SVN-Revision: 28934
---

diff --git a/package/base-files/files/etc/config/system b/package/base-files/files/etc/config/system
index ad51db5bd8..314f291870 100644
--- 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 47faa3cc50..1d29ad8c39 100644
--- 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