diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-21 11:10:09 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-21 11:10:09 -0400 |
| commit | 44040f107e64d689ccd3211ac62c6bc44f3f0775 (patch) | |
| tree | f85059028aa570e758c7fb272fd8cf823ab4f119 /firmware/Makefile | |
| parent | 388dba30471c236a290c4082bce5f2b5cd1a7a06 (diff) | |
| parent | 28d520433b6375740990ab99d69b0d0067fd656b (diff) | |
Merge branch 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6
* 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: (133 commits)
drm/vgaarb: add VGA arbitration support to the drm and kms.
drm/radeon: some r420s have a CP race with the DMA engine.
drm/radeon/r600/kms: rv670 is not DCE3
drm/radeon/kms: r420 idle after programming GA_ENHANCE
drm/radeon/kms: more fixes to rv770 suspend/resume path.
drm/radeon/kms: more alignment for rv770.c with r600.c
drm/radeon/kms: rv770 blit init called too late.
drm/radeon/kms: move around new init path code to avoid posting at init
drm/radeon/r600: fix some issues with suspend/resume.
drm/radeon/kms: disable VGA rendering engine before taking over VRAM
drm/radeon/kms: Move radeon_get_clock_info() call out of radeon_clocks_init().
drm/radeon/kms: add initial connector properties
drm/radeon/kms: Use surfaces for scanout / cursor byte swapping on big endian.
drm/radeon/kms: don't fail if we fail to init GPU acceleration
drm/r600/kms: fixup number of loops per blit calculation.
drm/radeon/kms: reprogram format in set base.
drm/radeon: avivo chips have no separate int bit for display
drm/radeon/r600: don't do interrupts
drm: fix _DRM_GEM addmap error message
drm: update crtc x/y when only fb changes
...
Fixed up trivial conflicts in firmware/Makefile due to network driver
(cxgb3) and drm (mga/r128/radeon) firmware being listed next to each
other.
Diffstat (limited to 'firmware/Makefile')
| -rw-r--r-- | firmware/Makefile | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/firmware/Makefile b/firmware/Makefile index ffe2663d49f2..5ea80b19785b 100644 --- a/firmware/Makefile +++ b/firmware/Makefile | |||
| @@ -46,6 +46,22 @@ fw-shipped-$(CONFIG_CHELSIO_T3) += cxgb3/t3b_psram-1.1.0.bin \ | |||
| 46 | cxgb3/ael2005_opt_edc.bin \ | 46 | cxgb3/ael2005_opt_edc.bin \ |
| 47 | cxgb3/ael2005_twx_edc.bin \ | 47 | cxgb3/ael2005_twx_edc.bin \ |
| 48 | cxgb3/ael2020_twx_edc.bin | 48 | cxgb3/ael2020_twx_edc.bin |
| 49 | fw-shipped-$(CONFIG_DRM_MGA) += matrox/g200_warp.fw matrox/g400_warp.fw | ||
| 50 | fw-shipped-$(CONFIG_DRM_R128) += r128/r128_cce.bin | ||
| 51 | fw-shipped-$(CONFIG_DRM_RADEON) += radeon/R100_cp.bin radeon/R200_cp.bin \ | ||
| 52 | radeon/R300_cp.bin radeon/R420_cp.bin \ | ||
| 53 | radeon/RS690_cp.bin radeon/RS600_cp.bin \ | ||
| 54 | radeon/R520_cp.bin \ | ||
| 55 | radeon/R600_pfp.bin radeon/R600_me.bin \ | ||
| 56 | radeon/RV610_pfp.bin radeon/RV610_me.bin \ | ||
| 57 | radeon/RV630_pfp.bin radeon/RV630_me.bin \ | ||
| 58 | radeon/RV620_pfp.bin radeon/RV620_me.bin \ | ||
| 59 | radeon/RV635_pfp.bin radeon/RV635_me.bin \ | ||
| 60 | radeon/RV670_pfp.bin radeon/RV670_me.bin \ | ||
| 61 | radeon/RS780_pfp.bin radeon/RS780_me.bin \ | ||
| 62 | radeon/RV770_pfp.bin radeon/RV770_me.bin \ | ||
| 63 | radeon/RV730_pfp.bin radeon/RV730_me.bin \ | ||
| 64 | radeon/RV710_pfp.bin radeon/RV710_me.bin | ||
| 49 | fw-shipped-$(CONFIG_DVB_AV7110) += av7110/bootcode.bin | 65 | fw-shipped-$(CONFIG_DVB_AV7110) += av7110/bootcode.bin |
| 50 | fw-shipped-$(CONFIG_DVB_TTUSB_BUDGET) += ttusb-budget/dspbootcode.bin | 66 | fw-shipped-$(CONFIG_DVB_TTUSB_BUDGET) += ttusb-budget/dspbootcode.bin |
| 51 | fw-shipped-$(CONFIG_E100) += e100/d101m_ucode.bin e100/d101s_ucode.bin \ | 67 | fw-shipped-$(CONFIG_E100) += e100/d101m_ucode.bin e100/d101s_ucode.bin \ |