diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /drivers/char/agp/compat_ioctl.c | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'drivers/char/agp/compat_ioctl.c')
| -rw-r--r-- | drivers/char/agp/compat_ioctl.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/char/agp/compat_ioctl.c b/drivers/char/agp/compat_ioctl.c index 9d2c97a69cdd..a48e05b31593 100644 --- a/drivers/char/agp/compat_ioctl.c +++ b/drivers/char/agp/compat_ioctl.c | |||
| @@ -276,7 +276,6 @@ long compat_agp_ioctl(struct file *file, unsigned int cmd, unsigned long arg) | |||
| 276 | break; | 276 | break; |
| 277 | 277 | ||
| 278 | case AGPIOC_CHIPSET_FLUSH32: | 278 | case AGPIOC_CHIPSET_FLUSH32: |
| 279 | ret_val = agpioc_chipset_flush_wrap(curr_priv); | ||
| 280 | break; | 279 | break; |
| 281 | } | 280 | } |
| 282 | 281 | ||