mtd: orion_nand: remove <mach/hardware.h> include

Linux-MTD Mailing List linux-mtd at lists.infradead.org
Sat Sep 29 10:59:11 EDT 2012


Gitweb:     http://git.infradead.org/?p=mtd-2.6.git;a=commit;h=32098f6af02754b357ce303afd1bd00a470f906c
Commit:     32098f6af02754b357ce303afd1bd00a470f906c
Parent:     f45c2990dc3de65d22e5f3b2f6b5df60a102e493
Author:     Thomas Petazzoni <thomas.petazzoni at free-electrons.com>
AuthorDate: Tue Aug 28 01:35:28 2012 +0200
Committer:  David Woodhouse <David.Woodhouse at intel.com>
CommitDate: Sat Sep 29 15:13:18 2012 +0100

    mtd: orion_nand: remove <mach/hardware.h> include
    
    Commit abcda1dc ('arm: plat-orion: introduce PLAT_ORION_LEGACY hidden
    config option') currently pending in linux-next will make the ARCH_MVEBU
    platform select PLAT_ORION, which means that now all Orion drivers can
    be enabled on ARCH_MVEBU. This works fine for most drivers, except for
    orion_nand, because it includes <mach/hardware.h>, but mach-mvebu does
    not have a mach/hardware.h header (it is considered as a deprecated
    practice).
    
    It turns out that the <mach/hardware.h> include in orion_nand is not
    necessary: the driver builds perfectly fine without it, so we simply
    get rid of it.
    
    Signed-off-by: Thomas Petazzoni <thomas.petazzoni at free-electrons.com>
    Tested-by: Andrew Lunn <andrew at lunn.ch>
    Signed-off-by: Artem Bityutskiy <artem.bityutskiy at linux.intel.com>
    Signed-off-by: David Woodhouse <David.Woodhouse at intel.com>
---
 drivers/mtd/nand/orion_nand.c |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/drivers/mtd/nand/orion_nand.c b/drivers/mtd/nand/orion_nand.c
index fc5a868..9ee436d 100644
--- a/drivers/mtd/nand/orion_nand.c
+++ b/drivers/mtd/nand/orion_nand.c
@@ -21,7 +21,6 @@
 #include <linux/err.h>
 #include <asm/io.h>
 #include <asm/sizes.h>
-#include <mach/hardware.h>
 #include <plat/orion_nand.h>
 
 static void orion_nand_cmd_ctrl(struct mtd_info *mtd, int cmd, unsigned int ctrl)



More information about the linux-mtd-cvs mailing list