aboutsummaryrefslogtreecommitdiff
path: root/include/video/neomagic.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-10-17 15:09:20 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-10-17 15:09:20 -0700
commitf7ea4a4ba84f382e8eb143e435551de0feee5b4b (patch)
tree0771d5413f1b9104816ca0ddec21c5503d562a3d /include/video/neomagic.h
parent5564da7e9d12ea80745f66c8d2ec7bd00f3f94eb (diff)
parent4b40893918203ee1a1f6a114316c2a19c072e9bd (diff)
Merge branch 'drm-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6
* 'drm-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: (44 commits) drm/i915: fix ioremap of a user address for non-root (CVE-2008-3831) drm: make CONFIG_DRM depend on CONFIG_SHMEM. radeon: fix PCI bus mastering support enables. radeon: add RS400 family support. drm/radeon: add support for RS740 IGP chipsets. i915: GM45 has GM965-style MCH setup. i915: Don't run retire work handler while suspended i915: Map status page cached for chips with GTT-based HWS location. i915: Fix up ring initialization to cover G45 oddities i915: Use non-reserved status page index for breadcrumb drm: Increment dev_priv->irq_received so i915_gem_interrupts count works. drm: kill drm_device->irq drm: wbinvd is cache coherent. i915: add missing return in error path. i915: fixup permissions on gem ioctls. drm: Clean up many sparse warnings in i915. drm: Use ioremap_wc in i915_driver instead of ioremap, since we always want WC. drm: G33-class hardware has a newer 965-style MCH (no DCC register). drm: Avoid oops in GEM execbuffers with bad arguments. DRM: Return -EBADF on bad object in flink, and return curent name if it exists. ...
Diffstat (limited to 'include/video/neomagic.h')
0 files changed, 0 insertions, 0 deletions