diff options
| author | Dave Airlie <airlied@starflyer.(none)> | 2005-10-20 04:21:33 -0400 |
|---|---|---|
| committer | Dave Airlie <airlied@linux.ie> | 2005-10-20 04:21:33 -0400 |
| commit | 312f5726055534be1dc9dd369be13aabd2943fcb (patch) | |
| tree | 29394a3f83b4952a73b36a4aa962dfeda839e9db /drivers/mtd/nand/s3c2410.c | |
| parent | 3d5efad953c6d5ba11d5bcb584ef8e906f953a73 (diff) | |
| parent | 93918e9afc76717176e9e114e79cdbb602a45ae8 (diff) | |
merge Linus head tree into my drm tree and fix up conflicts
Diffstat (limited to 'drivers/mtd/nand/s3c2410.c')
| -rw-r--r-- | drivers/mtd/nand/s3c2410.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/mtd/nand/s3c2410.c b/drivers/mtd/nand/s3c2410.c index 891e3a1b9110..b47ebcb31e0f 100644 --- a/drivers/mtd/nand/s3c2410.c +++ b/drivers/mtd/nand/s3c2410.c | |||
| @@ -58,7 +58,6 @@ | |||
| 58 | #include <linux/mtd/partitions.h> | 58 | #include <linux/mtd/partitions.h> |
| 59 | 59 | ||
| 60 | #include <asm/io.h> | 60 | #include <asm/io.h> |
| 61 | #include <asm/mach-types.h> | ||
| 62 | #include <asm/hardware/clock.h> | 61 | #include <asm/hardware/clock.h> |
| 63 | 62 | ||
| 64 | #include <asm/arch/regs-nand.h> | 63 | #include <asm/arch/regs-nand.h> |