ARM: integrator: merge platform.h to hardware.h
authorLinus Walleij <linus.walleij@linaro.org>
Thu, 13 Feb 2014 20:20:57 +0000 (21:20 +0100)
committerLinus Walleij <linus.walleij@linaro.org>
Wed, 26 Feb 2014 12:49:06 +0000 (13:49 +0100)
commitf8487aa85b0f3c092bb3c1f27972b445a1944048
tree66ec745761a84a3bec58df046f66ebdba5b50451
parentcc0cc4ca093f3df9e554af8dae39a126987bccf7
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
arch/arm/mach-integrator/include/mach/hardware.h
arch/arm/mach-integrator/include/mach/platform.h [deleted file]
arch/arm/mach-integrator/integrator_ap.c
arch/arm/mach-integrator/integrator_cp.c
arch/arm/mach-integrator/leds.c
arch/arm/mach-integrator/pci_v3.c