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:
  [POWERPC] Minor comment fix for misc_64.S
  [POWERPC] Use H_CEDE on non-SMT
  [POWERPC] force 64bit mode in fwnmi handlers to workaround firmware bugs
  [POWERPC] PMAC_APM_EMU should depend on ADB_PMU
  [POWERPC] Fix new interrupt code (MPIC detection)
  [POWERPC] Fix new interrupt code (MPIC endianness)
  [POWERPC] Add cpufreq support for Xserve G5
  [POWERPC] Xserve G5 thermal control fixes
  [POWERPC] Fix mem= handling when the memory limit is > RMO size
  [POWERPC] More offb/bootx fixes
  [POWERPC] Fix legacy_serial.c error handling on 32 bits
  [POWERPC] Fix default clock for udbg_16550
  [POWERPC] Fix non-MPIC CHRPs with CONFIG_SMP set
  [POWERPC] Fix 32 bits warning in prom_init.c
  [POWERPC] Workaround Pegasos incorrect ISA "ranges"
  [POWERPC] fix up front-LED Kconfig

diff --combined drivers/ide/Kconfig
index 556958ebbf03964ca515031923fba0b95427a6b2,53bba41f29bcc75459f9147d2012dfbfd394196a..b6fb167e20f681980a54c9baa7ef14a0de4fea83
--- 1/drivers/ide/Kconfig
--- 2/drivers/ide/Kconfig
+++ b/drivers/ide/Kconfig
@@@ -682,7 -682,6 +682,7 @@@ config BLK_DEV_SVWK
  config BLK_DEV_SGIIOC4
        tristate "Silicon Graphics IOC4 chipset ATA/ATAPI support"
        depends on (IA64_SGI_SN2 || IA64_GENERIC) && SGI_IOC4
 +      select IDEPCI_SHARE_IRQ
        help
          This driver adds PIO & MultiMode DMA-2 support for the SGI IOC4
          chipset, which has one channel and can support two devices.
@@@ -774,20 -773,6 +774,6 @@@ config BLK_DEV_IDEDMA_PMA
          to transfer data to and from memory.  Saying Y is safe and improves
          performance.
  
- config BLK_DEV_IDE_PMAC_BLINK
-       bool "Blink laptop LED on drive activity (DEPRECATED)"
-       depends on BLK_DEV_IDE_PMAC && ADB_PMU
-       select ADB_PMU_LED
-       select LEDS_TRIGGERS
-       select LEDS_TRIGGER_IDE_DISK
-       help
-         This option enables the use of the sleep LED as a hard drive
-         activity LED.
-         This option is deprecated, it only selects ADB_PMU_LED and
-         LEDS_TRIGGER_IDE_DISK and changes the code in the new led class
-         device to default to the ide-disk trigger (which should be set
-         from userspace via sysfs).
- 
  config BLK_DEV_IDE_SWARM
        tristate "IDE for Sibyte evaluation boards"
        depends on SIBYTE_SB1xxx_SOC

diff --combined drivers/macintosh/Kconfig
index d162307e309ff9c54d6ae3cf76e092e54800ed4c,44708b5e582ddecb1fe1774030f8cd865f37446c..d5d649f5ccdb3a05f14309fd1e11af83c7486a9f
--- 1/drivers/macintosh/Kconfig
--- 2/drivers/macintosh/Kconfig
+++ b/drivers/macintosh/Kconfig
@@@ -90,6 -90,15 +90,15 @@@ config ADB_PMU_LE
          and the ide-disk LED trigger and configure appropriately through
          sysfs.
  
+ config ADB_PMU_LED_IDE
+       bool "Use front LED as IDE LED by default"
+       depends on ADB_PMU_LED
+       select LEDS_TRIGGERS
+       select LEDS_TRIGGER_IDE_DISK
+       help
+         This option makes the front LED default to the IDE trigger
+         so that it blinks on IDE activity.
+ 
  config PMAC_SMU
        bool "Support for SMU  based PowerMacs"
        depends on PPC_PMAC64
@@@ -100,7 -109,7 +109,7 @@@
  
  config PMAC_APM_EMU
        tristate "APM emulation"
-       depends on PPC_PMAC && PPC32 && PM
+       depends on PPC_PMAC && PPC32 && PM && ADB_PMU
  
  config PMAC_MEDIABAY
        bool "Support PowerBook hotswap media bay"
@@@ -115,6 -124,8 +124,6 @@@ config PMAC_BACKLIGH
        bool "Backlight control for LCD screens"
        depends on ADB_PMU && FB = y && (BROKEN || !PPC64)
        select FB_BACKLIGHT
 -      select BACKLIGHT_CLASS_DEVICE
 -      select BACKLIGHT_LCD_SUPPORT
        help
          Say Y here to enable Macintosh specific extensions of the generic
          backlight code. With this enabled, the brightness keys on older