Merge branch 'simplify_PRT' into release

Conflicts:
	drivers/acpi/pci_irq.c

Note that this merge disables
e1d3a90846b40ad3160bf4b648d36c6badad39ac
pci, acpi: reroute PCI interrupt to legacy boot interrupt equivalent

Signed-off-by: Len Brown <len.brown@intel.com>

diff --combined include/acpi/platform/aclinux.h
index 3cabf888c8af192543afa043bc78a6706314b7c6,9116c986223453e74127c606395875f14041f4e8..6d49b2a498c4d5c92ae49d974be3b6a693b9bfae
--- 1/include/acpi/platform/aclinux.h
--- 2/include/acpi/platform/aclinux.h
+++ b/include/acpi/platform/aclinux.h
@@@ -46,7 -46,6 +46,7 @@@
  
  #define ACPI_USE_SYSTEM_CLIBRARY
  #define ACPI_USE_DO_WHILE_0
 +#define ACPI_MUTEX_TYPE             ACPI_BINARY_SEMAPHORE
  
  #ifdef __KERNEL__
  
@@@ -71,9 -70,6 +71,6 @@@
  #define ACPI_EXPORT_SYMBOL(symbol)  EXPORT_SYMBOL(symbol);
  #define strtoul                     simple_strtoul
  
- /* Full namespace pathname length limit - arbitrary */
- #define ACPI_PATHNAME_MAX              256
- 
  #else                         /* !__KERNEL__ */
  
  #include <stdarg.h>

diff --combined include/linux/acpi.h
index dfa0a5356c531b93f51d5417b2357de50a92e5aa,813f937b3ab46db8ccfc5644f346c82c1c953ca6..6fce2fc2d124bc184da9f10f40e31ed97254a7f5
--- 1/include/linux/acpi.h
--- 2/include/linux/acpi.h
+++ b/include/linux/acpi.h
@@@ -131,22 -131,6 +131,6 @@@ extern int acpi_get_override_irq(int bu
   */
  void acpi_unregister_gsi (u32 gsi);
  
- struct acpi_prt_entry {
-       struct list_head        node;
-       struct acpi_pci_id      id;
-       u8                      pin;
-       struct {
-               acpi_handle             handle;
-               u32                     index;
-       }                       link;
-       u32                     irq;
- };
- 
- struct acpi_prt_list {
-       int                     count;
-       struct list_head        entries;
- };
- 
  struct pci_dev;
  
  int acpi_pci_irq_enable (struct pci_dev *dev);
@@@ -270,7 -254,6 +254,7 @@@ int acpi_check_mem_region(resource_size
  #ifdef CONFIG_PM_SLEEP
  void __init acpi_no_s4_hw_signature(void);
  void __init acpi_old_suspend_ordering(void);
 +void __init acpi_s4_no_nvs(void);
  #endif /* CONFIG_PM_SLEEP */
  #else /* CONFIG_ACPI */