diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-10-03 19:28:46 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-10-03 19:28:46 +0200 |
| commit | f68ec0c24755e5cdb779be6240925f2175311d84 (patch) | |
| tree | a7b7128e61a8456385d82bd1c7ca5f14eecbf2ca /drivers/mtd/maps/ixp2000.c | |
| parent | Revert "x86: fix ghost EDD devices in /sys again" (diff) | |
| parent | Linux 2.6.27-rc8 (diff) | |
| download | linux-f68ec0c24755e5cdb779be6240925f2175311d84.tar.xz linux-f68ec0c24755e5cdb779be6240925f2175311d84.zip | |
Merge commit 'v2.6.27-rc8' into x86/setup
Diffstat (limited to 'drivers/mtd/maps/ixp2000.c')
| -rw-r--r-- | drivers/mtd/maps/ixp2000.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/mtd/maps/ixp2000.c b/drivers/mtd/maps/ixp2000.c index c8396b8574c4..dcdb1f17577d 100644 --- a/drivers/mtd/maps/ixp2000.c +++ b/drivers/mtd/maps/ixp2000.c @@ -1,6 +1,4 @@ /* - * $Id: ixp2000.c,v 1.9 2005/11/07 11:14:27 gleixner Exp $ - * * drivers/mtd/maps/ixp2000.c * * Mapping for the Intel XScale IXP2000 based systems @@ -32,7 +30,7 @@ #include <linux/mtd/partitions.h> #include <asm/io.h> -#include <asm/hardware.h> +#include <mach/hardware.h> #include <asm/mach/flash.h> #include <linux/reboot.h> |