summaryrefslogtreecommitdiff
path: root/drivers/char/agp/compat_ioctl.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2008-02-05 20:54:10 +0300
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2008-02-05 20:54:10 +0300
commit9914712e2e0f80ddcc00c928d3f7a5848d925e1e (patch)
tree08862da0b2c7f20d920acddb5df157e17e0da234 /drivers/char/agp/compat_ioctl.c
parent488823f114a3cef58e7eb932cac977440a2a59cb (diff)
parentbc894606e8843808c232319f69c26c18f6eaa662 (diff)
downloadlinux-9914712e2e0f80ddcc00c928d3f7a5848d925e1e.tar.xz
Merge branch 'agp-patches' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/agp-2.6
* 'agp-patches' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/agp-2.6: agp: remove flush_agp_mappings calls from new flush handling code intel-agp: introduce IS_I915 and do some cleanups.. [intel_agp] fix name for G35 chipset intel-agp: fixup resource handling in flush code. intel-agp: add new chipset ID agp: remove unnecessary pci_dev_put agp: remove uid comparison as security check fix AGP warning agp/intel: Add chipset flushing support for i8xx chipsets. intel-agp: add chipset flushing support agp: add chipset flushing support to AGP interface
Diffstat (limited to 'drivers/char/agp/compat_ioctl.c')
-rw-r--r--drivers/char/agp/compat_ioctl.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/char/agp/compat_ioctl.c b/drivers/char/agp/compat_ioctl.c
index ecd4248861b9..39275794fe63 100644
--- a/drivers/char/agp/compat_ioctl.c
+++ b/drivers/char/agp/compat_ioctl.c
@@ -273,6 +273,10 @@ long compat_agp_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
case AGPIOC_UNBIND32:
ret_val = compat_agpioc_unbind_wrap(curr_priv, (void __user *) arg);
break;
+
+ case AGPIOC_CHIPSET_FLUSH32:
+ ret_val = agpioc_chipset_flush_wrap(curr_priv);
+ break;
}
ioctl_out: