Merge branch 'acpi' of git://git.linaro.org/arm/acpi/acpi into leg-kernelleg-20130925.0

Conflicts:
	arch/arm/Kconfig
	arch/arm/kernel/setup.c

2 files changed, 6 insertions, 1 deletions

diff --git a/include/linux/acpi.h b/include/linux/acpi.h
index a5db4aeefa36..6324f8bf8997 100644
--- a/include/linux/acpi.h
+++ b/include/linux/acpi.h
@@ -49,6 +49,7 @@ enum acpi_irq_model_id {
 	ACPI_IRQ_MODEL_IOAPIC,
 	ACPI_IRQ_MODEL_IOSAPIC,
 	ACPI_IRQ_MODEL_PLATFORM,
+	ACPI_IRQ_MODEL_GIC,
 	ACPI_IRQ_MODEL_COUNT
 };
 
@@ -87,7 +88,7 @@ static inline void acpi_initrd_override(void *data, size_t size)
 }
 #endif
 
-char * __acpi_map_table (unsigned long phys_addr, unsigned long size);
+char *__acpi_map_table(phys_addr_t phys_addr, unsigned long size);
 void __acpi_unmap_table(char *map, unsigned long size);
 int early_acpi_boot_init(void);
 int acpi_boot_init (void);
diff --git a/include/linux/of_fdt.h b/include/linux/of_fdt.h
index a478c62a2aab..d1ec52ff9151 100644
--- a/include/linux/of_fdt.h
+++ b/include/linux/of_fdt.h
@@ -96,6 +96,10 @@ extern int of_scan_flat_dt_by_path(const char *path,
 
 extern int early_init_dt_scan_chosen(unsigned long node, const char *uname,
 				     int depth, void *data);
+#if defined(CONFIG_ARM) || defined(CONFIG_ARM64)
+extern int early_init_dt_scan_acpi(unsigned long node, const char *uname,
+				   int depth, void *data);
+#endif
 extern void early_init_dt_check_for_initrd(unsigned long node);
 extern int early_init_dt_scan_memory(unsigned long node, const char *uname,
 				     int depth, void *data);