Merge branch 'for-2.6.25' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus...

* 'for-2.6.25' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: (454 commits)
  [POWERPC] Cell IOMMU fixed mapping support
  [POWERPC] Split out the ioid fetching/checking logic
  [POWERPC] Add support to cell_iommu_setup_page_tables() for multiple windows
  [POWERPC] Split out the IOMMU logic from cell_dma_dev_setup()
  [POWERPC] Split cell_iommu_setup_hardware() into two parts
  [POWERPC] Split out the logic that allocates struct iommus
  [POWERPC] Allocate the hash table under 1G on cell
  [POWERPC] Add set_dma_ops() to match get_dma_ops()
  [POWERPC] 83xx: Clean up / convert mpc83xx board DTS files to v1 format.
  [POWERPC] 85xx: Only invalidate TLB0 and TLB1
  [POWERPC] 83xx: Fix typo in mpc837x compatible entries
  [POWERPC] 85xx: convert sbc85* boards to use machine_device_initcall
  [POWERPC] 83xx: rework platform Kconfig
  [POWERPC] 85xx: rework platform Kconfig
  [POWERPC] 86xx: Remove unused IRQ defines
  [POWERPC] QE: Explicitly set address-cells and size cells for muram
  [POWERPC] Convert StorCenter DTS file to /dts-v1/ format.
  [POWERPC] 86xx: Convert all 86xx DTS files to /dts-v1/ format.
  [PPC] Remove 85xx from arch/ppc
  [PPC] Remove 83xx from arch/ppc
  ...

diff --combined arch/powerpc/Kconfig
index bb16443b6817b95390df4051bef4977f801b8bba,2bf2f3f5302929755919f2908a7c814fb16c7776..9c44af3db8d9e542f88f4c1c3df3caee21c447f0
--- 1/arch/powerpc/Kconfig
--- 2/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@@ -42,7 -42,7 +42,7 @@@ config GENERIC_HARDIRQ
        bool
        default y
  
 -config ARCH_SETS_UP_PER_CPU_AREA
 +config HAVE_SETUP_PER_CPU_AREA
        def_bool PPC64
  
  config IRQ_PER_CPU
@@@ -148,6 -148,9 +148,9 @@@ config DEFAULT_UIMAG
          Used to allow a board to specify it wants a uImage built by default
        default n
  
+ config REDBOOT
+       bool
+ 
  config PPC64_SWSUSP
        bool
        depends on PPC64 && (BROKEN || (PPC_PMAC64 && EXPERIMENTAL))
@@@ -168,11 -171,13 +171,13 @@@ config PPC_DC
  
  config PPC_OF_PLATFORM_PCI
        bool
+       depends on PCI
        depends on PPC64 # not supported on 32 bits yet
        default n
  
  source "init/Kconfig"
  
+ source "arch/powerpc/sysdev/Kconfig"
  source "arch/powerpc/platforms/Kconfig"
  
  menu "Kernel options"
@@@ -348,6 -353,14 +353,14 @@@ config PPC_64K_PAGE
          while on hardware with such support, it will be used to map
          normal application pages.
  
+ config PPC_SUBPAGE_PROT
+       bool "Support setting protections for 4k subpages"
+       depends on PPC_64K_PAGES
+       help
+         This option adds support for a system call to allow user programs
+         to set access permissions (read/write, readonly, or no access)
+         on the 4k subpages of each 64k page.
+ 
  config SCHED_SMT
        bool "SMT (Hyperthreading) scheduler support"
        depends on PPC64 && SMP
@@@ -425,7 -438,7 +438,7 @@@ endmen
  
  config ISA_DMA_API
        bool
-       default y
+       default !PPC_ISERIES || PCI
  
  menu "Bus options"
  
@@@ -475,7 -488,7 +488,7 @@@ config MC
  config PCI
        bool "PCI support" if 40x || CPM2 || PPC_83xx || PPC_85xx || PPC_86xx \
                || PPC_MPC52xx || (EMBEDDED && (PPC_PSERIES || PPC_ISERIES)) \
-               || PPC_PS3
+               || PPC_PS3 || 44x
        default y if !40x && !CPM2 && !8xx && !PPC_83xx \
                && !PPC_85xx && !PPC_86xx
        default PCI_PERMEDIA if !4xx && !CPM2 && !8xx