diff options
| author | Thomas Gleixner <tglx@mtd.linutronix.de> | 2005-11-06 09:36:37 -0500 |
|---|---|---|
| committer | Thomas Gleixner <tglx@mtd.linutronix.de> | 2005-11-06 09:36:37 -0500 |
| commit | 2fc2991175bf77395e6b15fe6b2304d3bf72da40 (patch) | |
| tree | b0ff38c09240e7c00e1577d447ebe89143d752dc /drivers/mtd/nand/s3c2410.c | |
| parent | 8b491d750885ebe8e7d385ce4186c85957d67123 (diff) | |
| parent | 7015faa7df829876a0f931cd18aa6d7c24a1b581 (diff) | |
Merge branch 'master' of /home/tglx/work/mtd/git/linux-2.6.git/
Diffstat (limited to 'drivers/mtd/nand/s3c2410.c')
| -rw-r--r-- | drivers/mtd/nand/s3c2410.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mtd/nand/s3c2410.c b/drivers/mtd/nand/s3c2410.c index 891e3a1b9110..2df5e47d1f5c 100644 --- a/drivers/mtd/nand/s3c2410.c +++ b/drivers/mtd/nand/s3c2410.c | |||
| @@ -48,9 +48,10 @@ | |||
| 48 | #include <linux/kernel.h> | 48 | #include <linux/kernel.h> |
| 49 | #include <linux/string.h> | 49 | #include <linux/string.h> |
| 50 | #include <linux/ioport.h> | 50 | #include <linux/ioport.h> |
| 51 | #include <linux/device.h> | 51 | #include <linux/platform_device.h> |
| 52 | #include <linux/delay.h> | 52 | #include <linux/delay.h> |
| 53 | #include <linux/err.h> | 53 | #include <linux/err.h> |
| 54 | #include <linux/slab.h> | ||
| 54 | 55 | ||
| 55 | #include <linux/mtd/mtd.h> | 56 | #include <linux/mtd/mtd.h> |
| 56 | #include <linux/mtd/nand.h> | 57 | #include <linux/mtd/nand.h> |
| @@ -58,7 +59,6 @@ | |||
| 58 | #include <linux/mtd/partitions.h> | 59 | #include <linux/mtd/partitions.h> |
| 59 | 60 | ||
| 60 | #include <asm/io.h> | 61 | #include <asm/io.h> |
| 61 | #include <asm/mach-types.h> | ||
| 62 | #include <asm/hardware/clock.h> | 62 | #include <asm/hardware/clock.h> |
| 63 | 63 | ||
| 64 | #include <asm/arch/regs-nand.h> | 64 | #include <asm/arch/regs-nand.h> |