diff options
author | David S. Miller <davem@davemloft.net> | 2009-03-31 14:43:54 -0700 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-03-31 14:43:54 -0700 |
commit | bb1fee86fdc7df1fd145fd3bfb16635274b7c73d (patch) | |
tree | 28ee1f27fc562d2b7f7ef9534d752b2bd2f30ea9 /firmware/Makefile | |
parent | 377f0a08e4cb56658d878d22c3aed4716e283c6b (diff) | |
parent | 75bf758f906315820cada99c169bd89bab3f4ba2 (diff) | |
download | kernel_samsung_smdk4412-bb1fee86fdc7df1fd145fd3bfb16635274b7c73d.zip kernel_samsung_smdk4412-bb1fee86fdc7df1fd145fd3bfb16635274b7c73d.tar.gz kernel_samsung_smdk4412-bb1fee86fdc7df1fd145fd3bfb16635274b7c73d.tar.bz2 |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jaswinder/net-next-2.6
Diffstat (limited to 'firmware/Makefile')
-rw-r--r-- | firmware/Makefile | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/firmware/Makefile b/firmware/Makefile index c6af61b..baf5ae4 100644 --- a/firmware/Makefile +++ b/firmware/Makefile @@ -26,6 +26,7 @@ fw-shipped- += acenic/tg1.bin else acenic-objs := acenic/tg1.bin acenic/tg2.bin endif +fw-shipped-$(CONFIG_3C359) += 3com/3C359.bin fw-shipped-$(CONFIG_ACENIC) += $(acenic-objs) fw-shipped-$(CONFIG_ADAPTEC_STARFIRE) += adaptec/starfire_rx.bin \ adaptec/starfire_tx.bin @@ -39,6 +40,7 @@ fw-shipped-$(CONFIG_CHELSIO_T3) += cxgb3/t3b_psram-1.1.0.bin \ fw-shipped-$(CONFIG_DVB_TTUSB_BUDGET) += ttusb-budget/dspbootcode.bin fw-shipped-$(CONFIG_E100) += e100/d101m_ucode.bin e100/d101s_ucode.bin \ e100/d102e_ucode.bin +fw-shipped-$(CONFIG_PCMCIA_SMC91C92) += ositech/Xilinx7OD.bin fw-shipped-$(CONFIG_SMCTR) += tr_smctr.bin fw-shipped-$(CONFIG_SND_KORG1212) += korg/k1212.dsp fw-shipped-$(CONFIG_SND_MAESTRO3) += ess/maestro3_assp_kernel.fw \ @@ -91,6 +93,7 @@ fw-shipped-$(CONFIG_USB_SERIAL_KEYSPAN_PDA) += keyspan_pda/keyspan_pda.fw fw-shipped-$(CONFIG_USB_SERIAL_XIRCOM) += keyspan_pda/xircom_pgs.fw fw-shipped-$(CONFIG_USB_VICAM) += vicam/firmware.fw fw-shipped-$(CONFIG_VIDEO_CPIA2) += cpia2/stv0672_vp4.bin +fw-shipped-$(CONFIG_YAM) += yam/1200.bin yam/9600.bin fw-shipped-all := $(fw-shipped-y) $(fw-shipped-m) $(fw-shipped-) |