[kernel] r12134 - in dists/sid/linux-2.6/debian: . config/powerpc

[Bastian Blank]

Author: waldi
Date: Sun Aug 24 20:03:44 2008
New Revision: 12134

Log:
* debian/changelog: Update.
* debian/config/powerpc/config
  - Set RTC_DRV_PPC.
  - Remove old GEN_RTC settings.
* debian/config/powerpc/config.powerpc64: Remove duplicate settings.


Modified:
   dists/sid/linux-2.6/debian/changelog
   dists/sid/linux-2.6/debian/config/powerpc/config
   dists/sid/linux-2.6/debian/config/powerpc/config.powerpc64

Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	(original)
+++ dists/sid/linux-2.6/debian/changelog	Sun Aug 24 20:03:44 2008
@@ -84,6 +84,9 @@
   [ Ian Campbell ]
   * [xen] import upstream fix to fb-defio driver used by Xen framebuffer.
 
+  [ Bastian Blank ]
+  * [powerpc] Enable proper RTC support. (closes: #484693)
+
  -- dann frazier <dannf at debian.org>  Wed, 20 Aug 2008 16:58:30 -0600
 
 linux-2.6 (2.6.26-3) unstable; urgency=low

Modified: dists/sid/linux-2.6/debian/config/powerpc/config
==============================================================================
--- dists/sid/linux-2.6/debian/config/powerpc/config	(original)
+++ dists/sid/linux-2.6/debian/config/powerpc/config	Sun Aug 24 20:03:44 2008
@@ -130,8 +130,6 @@
 CONFIG_PRINTER=m
 CONFIG_HVC_RTAS=y
 CONFIG_NVRAM=y
-CONFIG_GEN_RTC=y
-CONFIG_GEN_RTC_X=y
 CONFIG_DTLK=m
 CONFIG_APPLICOM=m
 
@@ -752,6 +750,11 @@
 CONFIG_TCIC=m
 
 ##
+## file: drivers/rtc/Kconfig
+##
+CONFIG_RTC_DRV_PPC=m
+
+##
 ## file: drivers/scsi/Kconfig
 ##
 CONFIG_SCSI_DPT_I2O=m

Modified: dists/sid/linux-2.6/debian/config/powerpc/config.powerpc64
==============================================================================
--- dists/sid/linux-2.6/debian/config/powerpc/config.powerpc64	(original)
+++ dists/sid/linux-2.6/debian/config/powerpc/config.powerpc64	Sun Aug 24 20:03:44 2008
@@ -101,8 +101,6 @@
 ##
 CONFIG_HVC_CONSOLE=y
 CONFIG_HVCS=m
-# CONFIG_RTC is not set
-# CONFIG_GEN_RTC is not set
 CONFIG_HANGCHECK_TIMER=m
 
 ##
@@ -157,11 +155,6 @@
 # CONFIG_HOTPLUG_PCI is not set
 
 ##
-## file: drivers/rtc/Kconfig
-##
-CONFIG_RTC_DRV_PPC=m
-
-##
 ## file: drivers/scsi/Kconfig
 ##
 CONFIG_SCSI_IBMVSCSI=m