Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6

* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
  [IA64] Support multiple CPUs going through OS_MCA
  [IA64] silence GCC ia64 unused variable warnings
  [IA64] prevent MCA when performing MMIO mmap to PCI config space
  [IA64] add sn_register_pmi_handler oemcall
  [IA64] Stop bit for brl instruction
  [IA64] SN: Correct ROM resource length for BIOS copy
  [IA64] Don't set psr.ic and psr.i simultaneously

diff --combined include/linux/pci.h
index a5602e26f4dd5219a5e63058ea47c5faa0bf6a7f,acb9387c03643543062d51ee103d57693b1c95c9..37a71580ad8a4f8b9e099e1e6e51b155ef50526b
--- 1/include/linux/pci.h
--- 2/include/linux/pci.h
+++ b/include/linux/pci.h
@@@ -111,8 -111,7 +111,8 @@@ enum pcie_reset_state 
  
  typedef unsigned short __bitwise pci_bus_flags_t;
  enum pci_bus_flags {
 -      PCI_BUS_FLAGS_NO_MSI = (__force pci_bus_flags_t) 1,
 +      PCI_BUS_FLAGS_NO_MSI   = (__force pci_bus_flags_t) 1,
 +      PCI_BUS_FLAGS_NO_MMRBC = (__force pci_bus_flags_t) 2,
  };
  
  struct pci_cap_saved_state {
@@@ -139,7 -138,6 +139,7 @@@ struct pci_dev 
        unsigned short  subsystem_vendor;
        unsigned short  subsystem_device;
        unsigned int    class;          /* 3 bytes: (base,sub,prog-if) */
 +      u8              revision;       /* PCI revision, low byte of class word */
        u8              hdr_type;       /* PCI header type (`multi' flag masked out) */
        u8              rom_base_reg;   /* which config register controls the ROM */
        u8              pin;            /* which interrupt pin this device uses */
@@@ -315,7 -313,7 +315,7 @@@ struct pci_dynids 
  
  /* ---------------------------------------------------------------- */
  /** PCI Error Recovery System (PCI-ERS).  If a PCI device driver provides
 - *  a set fof callbacks in struct pci_error_handlers, then that device driver
 + *  a set of callbacks in struct pci_error_handlers, then that device driver
   *  will be notified of PCI bus errors, and will be driven to recovery
   *  when an error occurs.
   */
@@@ -372,6 -370,7 +372,6 @@@ struct pci_driver 
        int  (*suspend_late) (struct pci_dev *dev, pm_message_t state);
        int  (*resume_early) (struct pci_dev *dev);
        int  (*resume) (struct pci_dev *dev);                   /* Device woken up */
 -      int  (*enable_wake) (struct pci_dev *dev, pci_power_t state, int enable);   /* Enable wake event */
        void (*shutdown) (struct pci_dev *dev);
  
        struct pci_error_handlers *err_handler;
@@@ -476,7 -475,7 +476,7 @@@ extern void pci_sort_breadthfirst(void)
  /* Generic PCI functions exported to card drivers */
  
  struct pci_dev __deprecated *pci_find_device (unsigned int vendor, unsigned int device, const struct pci_dev *from);
 -struct pci_dev *pci_find_slot (unsigned int bus, unsigned int devfn);
 +struct pci_dev __deprecated *pci_find_slot (unsigned int bus, unsigned int devfn);
  int pci_find_capability (struct pci_dev *dev, int cap);
  int pci_find_next_capability (struct pci_dev *dev, u8 pos, int cap);
  int pci_find_ext_capability (struct pci_dev *dev, int cap);
@@@ -545,16 -544,11 +545,16 @@@ void pci_set_master(struct pci_dev *dev
  int pci_set_pcie_reset_state(struct pci_dev *dev, enum pcie_reset_state state);
  #define HAVE_PCI_SET_MWI
  int __must_check pci_set_mwi(struct pci_dev *dev);
 +int pci_try_set_mwi(struct pci_dev *dev);
  void pci_clear_mwi(struct pci_dev *dev);
  void pci_intx(struct pci_dev *dev, int enable);
  void pci_msi_off(struct pci_dev *dev);
  int pci_set_dma_mask(struct pci_dev *dev, u64 mask);
  int pci_set_consistent_dma_mask(struct pci_dev *dev, u64 mask);
 +int pcix_get_max_mmrbc(struct pci_dev *dev);
 +int pcix_get_mmrbc(struct pci_dev *dev);
 +int pcix_set_mmrbc(struct pci_dev *dev, int mmrbc);
 +int pcie_set_readrq(struct pci_dev *dev, int rq);
  void pci_update_resource(struct pci_dev *dev, struct resource *res, int resno);
  int __must_check pci_assign_resource(struct pci_dev *dev, int i);
  int __must_check pci_assign_resource_fixed(struct pci_dev *dev, int i);
@@@ -566,6 -560,7 +566,7 @@@ void __iomem __must_check *pci_map_rom(
  void __iomem __must_check *pci_map_rom_copy(struct pci_dev *pdev, size_t *size);
  void pci_unmap_rom(struct pci_dev *pdev, void __iomem *rom);
  void pci_remove_rom(struct pci_dev *pdev);
+ size_t pci_get_rom_size(void __iomem *rom, size_t size);
  
  /* Power management related routines */
  int pci_save_state(struct pci_dev *dev);
@@@ -882,7 -877,5 +883,7 @@@ extern int pci_pci_problems
  extern unsigned long pci_cardbus_io_size;
  extern unsigned long pci_cardbus_mem_size;
  
 +extern int pcibios_add_platform_entries(struct pci_dev *dev);
 +
  #endif /* __KERNEL__ */
  #endif /* LINUX_PCI_H */