diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2008-10-13 12:13:56 -0400 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2008-10-13 12:13:56 -0400 |
| commit | e758936e02700ff88a0b08b722a3847b95283ef2 (patch) | |
| tree | 50c919bef1b459a778b85159d5929de95b6c4a01 /firmware/Makefile | |
| parent | 239cfbde1f5843c4a24199f117d5f67f637d72d5 (diff) | |
| parent | 4480f15b3306f43bbb0310d461142b4e897ca45b (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
include/asm-x86/statfs.h
Diffstat (limited to 'firmware/Makefile')
| -rw-r--r-- | firmware/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/firmware/Makefile b/firmware/Makefile index da75a6fbc6ba..ca8cd305ff93 100644 --- a/firmware/Makefile +++ b/firmware/Makefile | |||
| @@ -22,6 +22,7 @@ fw-external-y := $(subst ",,$(CONFIG_EXTRA_FIRMWARE)) | |||
| 22 | 22 | ||
| 23 | fw-shipped-$(CONFIG_ATARI_DSP56K) += dsp56k/bootstrap.bin | 23 | fw-shipped-$(CONFIG_ATARI_DSP56K) += dsp56k/bootstrap.bin |
| 24 | fw-shipped-$(CONFIG_ATM_AMBASSADOR) += atmsar11.fw | 24 | fw-shipped-$(CONFIG_ATM_AMBASSADOR) += atmsar11.fw |
| 25 | fw-shipped-$(CONFIG_CASSINI) += sun/cassini.bin | ||
| 25 | fw-shipped-$(CONFIG_COMPUTONE) += intelliport2.bin | 26 | fw-shipped-$(CONFIG_COMPUTONE) += intelliport2.bin |
| 26 | fw-shipped-$(CONFIG_DVB_TTUSB_BUDGET) += ttusb-budget/dspbootcode.bin | 27 | fw-shipped-$(CONFIG_DVB_TTUSB_BUDGET) += ttusb-budget/dspbootcode.bin |
| 27 | fw-shipped-$(CONFIG_SMCTR) += tr_smctr.bin | 28 | fw-shipped-$(CONFIG_SMCTR) += tr_smctr.bin |