ARM: integrator: merge platform.h to hardware.h

There is no need to have the two separate headers <mach/platform.h>
and <mach/hardware.h>, especially since we are now going to make them
local files. There is not one single driver outside the mach-integrator
folder referencing any of the files.

Cc: Will Deacon <will.deacon@arm.com>
Cc: Jonathan Austin <jonathan.austin@arm.com>
Cc: Russell King <linux@arm.linux.org.uk>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

arch/arm/mach-integrator/core.c

@@ -26,7 +26,6 @@
 #include <linux/of_address.h>
 
 #include <mach/hardware.h>
-#include <mach/platform.h>
 
 #include <asm/mach-types.h>
 #include <asm/mach/time.h>

arch/arm/mach-integrator/integrator_ap.c

@@ -45,7 +45,6 @@
 #include <linux/clk-provider.h>
 
 #include <mach/hardware.h>
-#include <mach/platform.h>
 #include <asm/hardware/arm_timer.h>
 #include <asm/setup.h>
 #include <asm/param.h>		/* HZ */

arch/arm/mach-integrator/integrator_cp.c

@@ -29,7 +29,6 @@
 #include <linux/sys_soc.h>
 
 #include <mach/hardware.h>
-#include <mach/platform.h>
 #include <asm/setup.h>
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>

arch/arm/mach-integrator/leds.c

@@ -12,7 +12,6 @@
 #include <linux/leds.h>
 
 #include <mach/hardware.h>
-#include <mach/platform.h>
 
 #include "cm.h"
 

arch/arm/mach-integrator/pci_v3.c

@@ -35,7 +35,6 @@
 #include <video/vga.h>
 
 #include <mach/hardware.h>
-#include <mach/platform.h>
 
 #include <asm/mach/map.h>
 #include <asm/signal.h>