diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-09-24 01:52:47 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-09-24 01:52:47 -0400 |
| commit | 23930fa1cebfea6f79881c588ccd1b0781e49e3f (patch) | |
| tree | 36d29e3f83661c4f5f45b6f74ac0d5f9886867a8 /drivers/mtd/nand/au1550nd.c | |
| parent | 36b35a5be0e4b406acd816e2122d153e875105be (diff) | |
| parent | 4f5537de7c1531398e84e18a24f667e49cc94208 (diff) | |
Merge branch 'master' into upstream
Diffstat (limited to 'drivers/mtd/nand/au1550nd.c')
| -rw-r--r-- | drivers/mtd/nand/au1550nd.c | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/drivers/mtd/nand/au1550nd.c b/drivers/mtd/nand/au1550nd.c index 31228334da12..09e421a96893 100644 --- a/drivers/mtd/nand/au1550nd.c +++ b/drivers/mtd/nand/au1550nd.c | |||
| @@ -21,18 +21,7 @@ | |||
| 21 | #include <linux/version.h> | 21 | #include <linux/version.h> |
| 22 | #include <asm/io.h> | 22 | #include <asm/io.h> |
| 23 | 23 | ||
| 24 | /* fixme: this is ugly */ | ||
| 25 | #if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 0) | ||
| 26 | #include <asm/mach-au1x00/au1xxx.h> | 24 | #include <asm/mach-au1x00/au1xxx.h> |
| 27 | #else | ||
| 28 | #include <asm/au1000.h> | ||
| 29 | #ifdef CONFIG_MIPS_PB1550 | ||
| 30 | #include <asm/pb1550.h> | ||
| 31 | #endif | ||
| 32 | #ifdef CONFIG_MIPS_DB1550 | ||
| 33 | #include <asm/db1x00.h> | ||
| 34 | #endif | ||
| 35 | #endif | ||
| 36 | 25 | ||
| 37 | /* | 26 | /* |
| 38 | * MTD structure for NAND controller | 27 | * MTD structure for NAND controller |