Merge branches 'ns9x' and 'machtypes' into devel

[mv-sheeva.git] / drivers / char / agp / compat_ioctl.c

diff --git a/drivers/char/agp/compat_ioctl.c b/drivers/char/agp/compat_ioctl.c
index ecd4248861b9dfda6475e29d0acfcc9c6c547f96..58c57cb2518cc7dcd4322c4bfbd97eeab69afdcb 100644 (file)
--- a/drivers/char/agp/compat_ioctl.c
+++ b/drivers/char/agp/compat_ioctl.c
@@ -214,7 +214,7 @@ long compat_agp_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
                ret_val = -EINVAL;
                goto ioctl_out;
        }
-       if ((agp_fe.backend_acquired != TRUE) &&
+       if ((agp_fe.backend_acquired != true) &&
            (cmd != AGPIOC_ACQUIRE32)) {
                ret_val = -EBUSY;
                goto ioctl_out;
@@ -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: