Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc

* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: (209 commits)
  [POWERPC] Create add_rtc() function to enable the RTC CMOS driver
  [POWERPC] Add H_ILLAN_ATTRIBUTES hcall number
  [POWERPC] xilinxfb: Parameterize xilinxfb platform device registration
  [POWERPC] Oprofile support for Power 5++
  [POWERPC] Enable arbitary speed tty ioctls and split input/output speed
  [POWERPC] Make drivers/char/hvc_console.c:khvcd() static
  [POWERPC] Remove dead code for preventing pread() and pwrite() calls
  [POWERPC] Remove unnecessary #undef printk from prom.c
  [POWERPC] Fix typo in Ebony default DTS
  [POWERPC] Check for NULL ppc_md.init_IRQ() before calling
  [POWERPC] Remove extra return statement
  [POWERPC] pasemi: Don't auto-select CONFIG_EMBEDDED
  [POWERPC] pasemi: Rename platform
  [POWERPC] arch/powerpc/kernel/sysfs.c: Move NUMA exports
  [POWERPC] Add __read_mostly support for powerpc
  [POWERPC] Modify sched_clock() to make CONFIG_PRINTK_TIME more sane
  [POWERPC] Create a dummy zImage if no valid platform has been selected
  [POWERPC] PS3: Bootwrapper support.
  [POWERPC] powermac i2c: Use mutex
  [POWERPC] Schedule removal of arch/ppc
  ...

Fixed up conflicts manually in:

	Documentation/feature-removal-schedule.txt
	arch/powerpc/kernel/pci_32.c
	arch/powerpc/kernel/pci_64.c
	include/asm-powerpc/pci.h

and asked the powerpc people to double-check the result..

1 files changed, 12 insertions, 2 deletions

diff --git a/arch/powerpc/sysdev/timer.c b/arch/powerpc/sysdev/timer.c
index 4a01748b4217..e81e7ec2e799 100644
--- a/arch/powerpc/sysdev/timer.c
+++ b/arch/powerpc/sysdev/timer.c
@@ -24,7 +24,12 @@ static int timer_resume(struct sys_device *dev)
 
         /* get current RTC time and convert to seconds */
         get_rtc_time(&cur_rtc_tm);
-        rtc_tm_to_time(&cur_rtc_tm, &cur_rtc_time);
+        cur_rtc_time = mktime(cur_rtc_tm.tm_year + 1900,
+                              cur_rtc_tm.tm_mon + 1,
+                              cur_rtc_tm.tm_mday,
+                              cur_rtc_tm.tm_hour,
+                              cur_rtc_tm.tm_min,
+                              cur_rtc_tm.tm_sec);
 
         diff = cur_rtc_time - suspend_rtc_time;
 
@@ -44,7 +49,12 @@ static int timer_suspend(struct sys_device *dev, pm_message_t state)
         WARN_ON(!ppc_md.get_rtc_time);
 
         get_rtc_time(&suspend_rtc_tm);
-        rtc_tm_to_time(&suspend_rtc_tm, &suspend_rtc_time);
+        suspend_rtc_time = mktime(suspend_rtc_tm.tm_year + 1900,
+                                  suspend_rtc_tm.tm_mon + 1,
+                                  suspend_rtc_tm.tm_mday,
+                                  suspend_rtc_tm.tm_hour,
+                                  suspend_rtc_tm.tm_min,
+                                  suspend_rtc_tm.tm_sec);
 
         return 0;
 }