diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-06-22 22:11:56 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-06-22 22:11:56 -0400 |
| commit | 71d530cd1b6d97094481002a04c77fea1c8e1c22 (patch) | |
| tree | e786da7145d83c19a594adf76ed90d52c51058b1 /include/asm-mips/mach-excite/excite_nandflash.h | |
| parent | d7a80dad2fe19a2b8c119c8e9cba605474a75a2b (diff) | |
| parent | d588fcbe5a7ba8bba2cebf7799ab2d573717a806 (diff) | |
Merge branch 'master' into upstream
Conflicts:
drivers/scsi/libata-core.c
drivers/scsi/libata-scsi.c
include/linux/pci_ids.h
Diffstat (limited to 'include/asm-mips/mach-excite/excite_nandflash.h')
| -rw-r--r-- | include/asm-mips/mach-excite/excite_nandflash.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/include/asm-mips/mach-excite/excite_nandflash.h b/include/asm-mips/mach-excite/excite_nandflash.h new file mode 100644 index 000000000000..c4cf6140622e --- /dev/null +++ b/include/asm-mips/mach-excite/excite_nandflash.h | |||
| @@ -0,0 +1,7 @@ | |||
| 1 | #ifndef __EXCITE_NANDFLASH_H__ | ||
| 2 | #define __EXCITE_NANDFLASH_H__ | ||
| 3 | |||
| 4 | /* Resource names */ | ||
| 5 | #define EXCITE_NANDFLASH_RESOURCE_REGS "excite_nandflash_regs" | ||
| 6 | |||
| 7 | #endif /* __EXCITE_NANDFLASH_H__ */ | ||