diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-07-15 21:07:59 -0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-07-15 21:07:59 -0400 |
| commit | 84c3d4aaec3338201b449034beac41635866bddf (patch) | |
| tree | 3412951682fb2dd4feb8a5532f8efbaf8b345933 /drivers/atm/Makefile | |
| parent | 43d2548bb2ef7e6d753f91468a746784041e522d (diff) | |
| parent | fafa3a3f16723997f039a0193997464d66dafd8f (diff) | |
Merge commit 'origin/master'
Manual merge of:
arch/powerpc/Kconfig
arch/powerpc/kernel/stacktrace.c
arch/powerpc/mm/slice.c
arch/ppc/kernel/smp.c
Diffstat (limited to 'drivers/atm/Makefile')
| -rw-r--r-- | drivers/atm/Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/atm/Makefile b/drivers/atm/Makefile index e4fa99658699..749266e955cd 100644 --- a/drivers/atm/Makefile +++ b/drivers/atm/Makefile | |||
| @@ -6,9 +6,9 @@ fore_200e-objs := fore200e.o | |||
| 6 | hostprogs-y := fore200e_mkfirm | 6 | hostprogs-y := fore200e_mkfirm |
| 7 | 7 | ||
| 8 | # Files generated that shall be removed upon make clean | 8 | # Files generated that shall be removed upon make clean |
| 9 | clean-files := atmsar11.bin atmsar11.bin1 atmsar11.bin2 pca200e.bin \ | 9 | clean-files := pca200e.bin pca200e.bin1 pca200e.bin2 pca200e_ecd.bin \ |
| 10 | pca200e.bin1 pca200e.bin2 pca200e_ecd.bin pca200e_ecd.bin1 \ | 10 | pca200e_ecd.bin1 pca200e_ecd.bin2 sba200e_ecd.bin sba200e_ecd.bin1 \ |
| 11 | pca200e_ecd.bin2 sba200e_ecd.bin sba200e_ecd.bin1 sba200e_ecd.bin2 | 11 | sba200e_ecd.bin2 |
| 12 | # Firmware generated that shall be removed upon make clean | 12 | # Firmware generated that shall be removed upon make clean |
| 13 | clean-files += fore200e_pca_fw.c fore200e_sba_fw.c | 13 | clean-files += fore200e_pca_fw.c fore200e_sba_fw.c |
| 14 | 14 | ||