diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-14 16:54:07 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-14 16:54:07 -0700 |
commit | 5a86102248592e178a9023359ccf7f0e489d8e35 (patch) | |
tree | 9e5fdb9aafca687fa412f7c034f2cfbb834b8567 /drivers/atm/Makefile | |
parent | 85082fd7cbe3173198aac0eb5e85ab1edcc6352c (diff) | |
parent | 751851af7aae9b8bd5a60b3897209081fbc18b2b (diff) | |
download | op-kernel-dev-5a86102248592e178a9023359ccf7f0e489d8e35.zip op-kernel-dev-5a86102248592e178a9023359ccf7f0e489d8e35.tar.gz |
Merge branch 'for-2.6.27' of git://git.infradead.org/users/dwmw2/firmware-2.6
* 'for-2.6.27' of git://git.infradead.org/users/dwmw2/firmware-2.6: (64 commits)
firmware: convert sb16_csp driver to use firmware loader exclusively
dsp56k: use request_firmware
edgeport-ti: use request_firmware()
edgeport: use request_firmware()
vicam: use request_firmware()
dabusb: use request_firmware()
cpia2: use request_firmware()
ip2: use request_firmware()
firmware: convert Ambassador ATM driver to request_firmware()
whiteheat: use request_firmware()
ti_usb_3410_5052: use request_firmware()
emi62: use request_firmware()
emi26: use request_firmware()
keyspan_pda: use request_firmware()
keyspan: use request_firmware()
ttusb-budget: use request_firmware()
kaweth: use request_firmware()
smctr: use request_firmware()
firmware: convert ymfpci driver to use firmware loader exclusively
firmware: convert maestro3 driver to use firmware loader exclusively
...
Fix up trivial conflicts with BKL removal in drivers/char/dsp56k.c and
drivers/char/ip2/ip2main.c manually.
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 e4fa996..749266e 100644 --- a/drivers/atm/Makefile +++ b/drivers/atm/Makefile @@ -6,9 +6,9 @@ fore_200e-objs := fore200e.o hostprogs-y := fore200e_mkfirm # Files generated that shall be removed upon make clean -clean-files := atmsar11.bin atmsar11.bin1 atmsar11.bin2 pca200e.bin \ - pca200e.bin1 pca200e.bin2 pca200e_ecd.bin pca200e_ecd.bin1 \ - pca200e_ecd.bin2 sba200e_ecd.bin sba200e_ecd.bin1 sba200e_ecd.bin2 +clean-files := pca200e.bin pca200e.bin1 pca200e.bin2 pca200e_ecd.bin \ + pca200e_ecd.bin1 pca200e_ecd.bin2 sba200e_ecd.bin sba200e_ecd.bin1 \ + sba200e_ecd.bin2 # Firmware generated that shall be removed upon make clean clean-files += fore200e_pca_fw.c fore200e_sba_fw.c |