diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-09-22 20:10:23 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-09-22 20:10:23 -0400 |
| commit | 28eb177dfa5982d132edceed891cb3885df258bb (patch) | |
| tree | 5f8fdc37ad1d8d0793e9c47da7d908b97c814ffb /drivers/mtd/nand/au1550nd.c | |
| parent | fd8ae94eea9bb4269d6dff1b47b9dc741bd70d0b (diff) | |
| parent | db392219c5f572610645696e3672f6ea38783a65 (diff) | |
Merge branch 'master' into upstream
Conflicts:
net/ieee80211/ieee80211_crypt_tkip.c
net/ieee80211/ieee80211_crypt_wep.c
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 |