aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/mtd/maps/omap_nor.c
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@pobox.com>2005-10-04 10:16:31 -0400
committerJeff Garzik <jgarzik@pobox.com>2005-10-04 10:16:31 -0400
commit2ee73cc2d507df7b28050fba5d08bd33dd34848c (patch)
treeaf5f33b265318e0f4b61f788691fe4f780ec402c /drivers/mtd/maps/omap_nor.c
parentc1d9728ecc5b560465df3c0c0d3b3825c2710b40 (diff)
parented39f731ab2e77e58122232f6e27333331d7793d (diff)
downloadkernel_samsung_crespo-2ee73cc2d507df7b28050fba5d08bd33dd34848c.zip
kernel_samsung_crespo-2ee73cc2d507df7b28050fba5d08bd33dd34848c.tar.gz
kernel_samsung_crespo-2ee73cc2d507df7b28050fba5d08bd33dd34848c.tar.bz2
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'drivers/mtd/maps/omap_nor.c')
-rw-r--r--drivers/mtd/maps/omap_nor.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/mtd/maps/omap_nor.c b/drivers/mtd/maps/omap_nor.c
index 8cc7140..b17bca6 100644
--- a/drivers/mtd/maps/omap_nor.c
+++ b/drivers/mtd/maps/omap_nor.c
@@ -42,7 +42,6 @@
#include <asm/io.h>
#include <asm/hardware.h>
-#include <asm/mach-types.h>
#include <asm/mach/flash.h>
#include <asm/arch/tc.h>