Merge ../powerpc-merge

diff --combined arch/powerpc/platforms/powermac/setup.c
index 616b1e3,1955462..97c54e1
--- 1/arch/powerpc/platforms/powermac/setup.c
--- 2/arch/powerpc/platforms/powermac/setup.c
+++ b/arch/powerpc/platforms/powermac/setup.c
@@@ -82,16 -82,15 +82,14 @@@
  
  #undef SHOW_GATWICK_IRQS
  
- unsigned char drive_info;
- 
  int ppc_override_l2cr = 0;
  int ppc_override_l2cr_value;
  int has_l2cache = 0;
  
 -int pmac_newworld = 1;
 +int pmac_newworld;
  
  static int current_root_goodness = -1;
  
 -extern int pmac_newworld;
  extern struct machdep_calls pmac_md;
  
  #define DEFAULT_ROOT_DEVICE Root_SDA1 /* sda1 - slightly silly choice */
@@@ -309,10 -308,9 +307,10 @@@ static void __init pmac_setup_arch(void
        for (ic = NULL; (ic = of_find_all_nodes(ic)) != NULL; )
                if (get_property(ic, "interrupt-controller", NULL))
                        break;
 -      pmac_newworld = (ic != NULL);
 -      if (ic)
 +      if (ic) {
 +              pmac_newworld = 1;
                of_node_put(ic);
 +      }
  
        /* Lookup PCI hosts */
        pmac_pci_init();

diff --combined arch/powerpc/sysdev/dart_iommu.c
index 929ad23,6298264..61d3174
--- 1/arch/powerpc/sysdev/dart_iommu.c
--- 2/arch/powerpc/sysdev/dart_iommu.c
+++ b/arch/powerpc/sysdev/dart_iommu.c
@@@ -59,7 -59,7 +59,7 @@@ static unsigned long dart_tablesize
  static u32 *dart_vbase;
  
  /* Mapped base address for the dart */
- static unsigned int *__iomem dart;
+ static unsigned int __iomem *dart;
  
  /* Dummy val that entries are set to when unused */
  static unsigned int dart_emptyval;
@@@ -194,6 -194,8 +194,6 @@@ static int dart_init(struct device_nod
         * prefetching into invalid pages and corrupting data
         */
        tmp = lmb_alloc(DART_PAGE_SIZE, DART_PAGE_SIZE);
 -      if (!tmp)
 -              panic("DART: Cannot allocate spare page!");
        dart_emptyval = DARTMAP_VALID | ((tmp >> DART_PAGE_SHIFT) &
                                         DARTMAP_RPNMASK);