From: git@ipfire.org
To: ipfire-scm@lists.ipfire.org
Subject: [git.ipfire.org] IPFire 2.x development tree branch, thirteen, updated. bff7ad01c47f9d4cb58042345c530f1ef12ee1ac
Date: Tue, 06 Nov 2012 13:39:45 +0100 [thread overview]
Message-ID: <20121106123945.7CC6F20130@argus.ipfire.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 9270 bytes --]
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".
The branch, thirteen has been updated
via bff7ad01c47f9d4cb58042345c530f1ef12ee1ac (commit)
via 2877336122bf64107050cf924e82d5d822b1cc72 (commit)
from 4de2df1e0c8dc103c5b845b1b538a6a303c6691c (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit bff7ad01c47f9d4cb58042345c530f1ef12ee1ac
Merge: 2877336 4de2df1
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Tue Nov 6 13:39:05 2012 +0100
Merge branch 'thirteen' of ssh://git.ipfire.org/pub/git/ipfire-2.x into thirteen
commit 2877336122bf64107050cf924e82d5d822b1cc72
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Tue Nov 6 12:38:49 2012 +0100
kernel: build rtc-cmos into i586 kernel.
-----------------------------------------------------------------------
Summary of changes:
config/kernel/kernel.config.i586-ipfire | 2 +-
config/kernel/kernel.config.i586-ipfire-pae | 70 ++++++++++++++++++++++++--
config/rootfiles/common/i586/linux | 1 -
config/rootfiles/packages/linux-pae | 36 +++++++++++++-
4 files changed, 98 insertions(+), 11 deletions(-)
Difference in files:
diff --git a/config/kernel/kernel.config.i586-ipfire b/config/kernel/kernel.config.i586-ipfire
index 97cc119..4482c9b 100644
--- a/config/kernel/kernel.config.i586-ipfire
+++ b/config/kernel/kernel.config.i586-ipfire
@@ -3929,7 +3929,7 @@ CONFIG_RTC_DRV_RV3029C2=m
#
# Platform RTC drivers
#
-CONFIG_RTC_DRV_CMOS=m
+CONFIG_RTC_DRV_CMOS=y
CONFIG_RTC_DRV_DS1286=m
CONFIG_RTC_DRV_DS1511=m
CONFIG_RTC_DRV_DS1553=m
diff --git a/config/kernel/kernel.config.i586-ipfire-pae b/config/kernel/kernel.config.i586-ipfire-pae
index e50ea0b..2298c53 100644
--- a/config/kernel/kernel.config.i586-ipfire-pae
+++ b/config/kernel/kernel.config.i586-ipfire-pae
@@ -2452,9 +2452,6 @@ CONFIG_HW_RANDOM_GEODE=m
CONFIG_HW_RANDOM_VIA=m
CONFIG_HW_RANDOM_VIRTIO=m
CONFIG_NVRAM=m
-CONFIG_RTC=m
-CONFIG_GEN_RTC=m
-CONFIG_GEN_RTC_X=y
# CONFIG_DTLK is not set
# CONFIG_R3964 is not set
# CONFIG_APPLICOM is not set
@@ -3459,8 +3456,6 @@ CONFIG_SND_PCM_OSS=m
CONFIG_SND_PCM_OSS_PLUGINS=y
CONFIG_SND_SEQUENCER_OSS=y
# CONFIG_SND_HRTIMER is not set
-CONFIG_SND_RTCTIMER=m
-CONFIG_SND_SEQ_RTCTIMER_DEFAULT=y
# CONFIG_SND_DYNAMIC_MINORS is not set
# CONFIG_SND_SUPPORT_OLD_API is not set
CONFIG_SND_VERBOSE_PROCFS=y
@@ -3955,7 +3950,70 @@ CONFIG_LEDS_TRIGGER_NETDEV=m
# CONFIG_ACCESSIBILITY is not set
# CONFIG_INFINIBAND is not set
# CONFIG_EDAC is not set
-# CONFIG_RTC_CLASS is not set
+CONFIG_RTC_LIB=y
+CONFIG_RTC_CLASS=y
+CONFIG_RTC_HCTOSYS=y
+CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
+# CONFIG_RTC_DEBUG is not set
+
+#
+# RTC interfaces
+#
+CONFIG_RTC_INTF_SYSFS=y
+CONFIG_RTC_INTF_PROC=y
+CONFIG_RTC_INTF_DEV=y
+# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
+# CONFIG_RTC_DRV_TEST is not set
+
+#
+# I2C RTC drivers
+#
+CONFIG_RTC_DRV_DS1307=m
+CONFIG_RTC_DRV_DS1374=m
+CONFIG_RTC_DRV_DS1672=m
+CONFIG_RTC_DRV_DS3232=m
+CONFIG_RTC_DRV_MAX6900=m
+CONFIG_RTC_DRV_RS5C372=m
+CONFIG_RTC_DRV_ISL1208=m
+CONFIG_RTC_DRV_ISL12022=m
+CONFIG_RTC_DRV_X1205=m
+CONFIG_RTC_DRV_PCF8563=m
+CONFIG_RTC_DRV_PCF8583=m
+CONFIG_RTC_DRV_M41T80=m
+CONFIG_RTC_DRV_M41T80_WDT=y
+CONFIG_RTC_DRV_BQ32K=m
+CONFIG_RTC_DRV_S35390A=m
+CONFIG_RTC_DRV_FM3130=m
+CONFIG_RTC_DRV_RX8581=m
+CONFIG_RTC_DRV_RX8025=m
+CONFIG_RTC_DRV_EM3027=m
+CONFIG_RTC_DRV_RV3029C2=m
+
+#
+# SPI RTC drivers
+#
+
+#
+# Platform RTC drivers
+#
+CONFIG_RTC_DRV_CMOS=y
+CONFIG_RTC_DRV_DS1286=m
+CONFIG_RTC_DRV_DS1511=m
+CONFIG_RTC_DRV_DS1553=m
+CONFIG_RTC_DRV_DS1742=m
+CONFIG_RTC_DRV_STK17TA8=m
+CONFIG_RTC_DRV_M48T86=m
+CONFIG_RTC_DRV_M48T35=m
+CONFIG_RTC_DRV_M48T59=m
+CONFIG_RTC_DRV_MSM6242=m
+CONFIG_RTC_DRV_BQ4802=m
+CONFIG_RTC_DRV_RP5C01=m
+CONFIG_RTC_DRV_V3020=m
+CONFIG_RTC_DRV_PCF50633=m
+
+#
+# on-CPU RTC drivers
+#
CONFIG_DMADEVICES=y
# CONFIG_DMADEVICES_DEBUG is not set
diff --git a/config/rootfiles/common/i586/linux b/config/rootfiles/common/i586/linux
index 0f5498a..03ecc63 100644
--- a/config/rootfiles/common/i586/linux
+++ b/config/rootfiles/common/i586/linux
@@ -1378,7 +1378,6 @@ lib/modules/KVER-ipfire
#lib/modules/KVER-ipfire/kernel/drivers/rtc
#lib/modules/KVER-ipfire/kernel/drivers/rtc/rtc-bq32k.ko
#lib/modules/KVER-ipfire/kernel/drivers/rtc/rtc-bq4802.ko
-#lib/modules/KVER-ipfire/kernel/drivers/rtc/rtc-cmos.ko
#lib/modules/KVER-ipfire/kernel/drivers/rtc/rtc-ds1286.ko
#lib/modules/KVER-ipfire/kernel/drivers/rtc/rtc-ds1307.ko
#lib/modules/KVER-ipfire/kernel/drivers/rtc/rtc-ds1374.ko
diff --git a/config/rootfiles/packages/linux-pae b/config/rootfiles/packages/linux-pae
index 7bb598d..a75c461 100644
--- a/config/rootfiles/packages/linux-pae
+++ b/config/rootfiles/packages/linux-pae
@@ -244,7 +244,6 @@ lib/modules/KVER-ipfire-pae
#lib/modules/KVER-ipfire-pae/kernel/drivers/char/agp/sis-agp.ko
#lib/modules/KVER-ipfire-pae/kernel/drivers/char/agp/sworks-agp.ko
#lib/modules/KVER-ipfire-pae/kernel/drivers/char/agp/via-agp.ko
-#lib/modules/KVER-ipfire-pae/kernel/drivers/char/genrtc.ko
#lib/modules/KVER-ipfire-pae/kernel/drivers/char/hangcheck-timer.ko
#lib/modules/KVER-ipfire-pae/kernel/drivers/char/hw_random
#lib/modules/KVER-ipfire-pae/kernel/drivers/char/hw_random/amd-rng.ko
@@ -270,7 +269,6 @@ lib/modules/KVER-ipfire-pae
#lib/modules/KVER-ipfire-pae/kernel/drivers/char/pcmcia
#lib/modules/KVER-ipfire-pae/kernel/drivers/char/pcmcia/synclink_cs.ko
#lib/modules/KVER-ipfire-pae/kernel/drivers/char/ppdev.ko
-#lib/modules/KVER-ipfire-pae/kernel/drivers/char/rtc.ko
#lib/modules/KVER-ipfire-pae/kernel/drivers/char/scx200_gpio.ko
#lib/modules/KVER-ipfire-pae/kernel/drivers/char/toshiba.ko
#lib/modules/KVER-ipfire-pae/kernel/drivers/clocksource
@@ -1393,6 +1391,39 @@ lib/modules/KVER-ipfire-pae
#lib/modules/KVER-ipfire-pae/kernel/drivers/regulator
#lib/modules/KVER-ipfire-pae/kernel/drivers/regulator/fixed.ko
#lib/modules/KVER-ipfire-pae/kernel/drivers/regulator/gpio-regulator.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/rtc
+#lib/modules/KVER-ipfire-pae/kernel/drivers/rtc/rtc-bq32k.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/rtc/rtc-bq4802.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/rtc/rtc-ds1286.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/rtc/rtc-ds1307.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/rtc/rtc-ds1374.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/rtc/rtc-ds1511.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/rtc/rtc-ds1553.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/rtc/rtc-ds1672.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/rtc/rtc-ds1742.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/rtc/rtc-ds3232.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/rtc/rtc-em3027.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/rtc/rtc-fm3130.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/rtc/rtc-isl12022.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/rtc/rtc-isl1208.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/rtc/rtc-m41t80.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/rtc/rtc-m48t35.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/rtc/rtc-m48t59.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/rtc/rtc-m48t86.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/rtc/rtc-max6900.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/rtc/rtc-msm6242.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/rtc/rtc-pcf50633.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/rtc/rtc-pcf8563.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/rtc/rtc-pcf8583.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/rtc/rtc-rp5c01.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/rtc/rtc-rs5c372.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/rtc/rtc-rv3029c2.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/rtc/rtc-rx8025.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/rtc/rtc-rx8581.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/rtc/rtc-s35390a.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/rtc/rtc-stk17ta8.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/rtc/rtc-v3020.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/rtc/rtc-x1205.ko
#lib/modules/KVER-ipfire-pae/kernel/drivers/scsi
#lib/modules/KVER-ipfire-pae/kernel/drivers/scsi/3w-9xxx.ko
#lib/modules/KVER-ipfire-pae/kernel/drivers/scsi/3w-sas.ko
@@ -2238,7 +2269,6 @@ lib/modules/KVER-ipfire-pae
#lib/modules/KVER-ipfire-pae/kernel/sound/core/snd-page-alloc.ko
#lib/modules/KVER-ipfire-pae/kernel/sound/core/snd-pcm.ko
#lib/modules/KVER-ipfire-pae/kernel/sound/core/snd-rawmidi.ko
-#lib/modules/KVER-ipfire-pae/kernel/sound/core/snd-rtctimer.ko
#lib/modules/KVER-ipfire-pae/kernel/sound/core/snd-timer.ko
#lib/modules/KVER-ipfire-pae/kernel/sound/core/snd.ko
#lib/modules/KVER-ipfire-pae/kernel/sound/drivers
hooks/post-receive
--
IPFire 2.x development tree
reply other threads:[~2012-11-06 12:39 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20121106123945.7CC6F20130@argus.ipfire.org \
--to=git@ipfire.org \
--cc=ipfire-scm@lists.ipfire.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox