diff options
| author | Dave Airlie <airlied@redhat.com> | 2012-07-20 06:53:28 +0200 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2012-07-20 06:53:28 +0200 |
| commit | e6b0b6a82f9c93fe3dd060ae54719456474a74a3 (patch) | |
| tree | 89528134f61971718b1fa363b54bc3c7cebf1392 /drivers/media/video/pms.c | |
| parent | drm/sis: fixup sis_mm ioctl structs (diff) | |
| parent | Linux 3.5-rc7 (diff) | |
| download | linux-e6b0b6a82f9c93fe3dd060ae54719456474a74a3.tar.xz linux-e6b0b6a82f9c93fe3dd060ae54719456474a74a3.zip | |
Merge tag 'v3.5-rc7' into drm-next
Merge Linus tree into drm to fixup conflicts in radeon code for further
testing before upstream merge.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Conflicts:
drivers/gpu/drm/i915/i915_dma.c
drivers/gpu/drm/i915/intel_display.c
drivers/gpu/drm/radeon/radeon_gart.c
Diffstat (limited to 'drivers/media/video/pms.c')
| -rw-r--r-- | drivers/media/video/pms.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/media/video/pms.c b/drivers/media/video/pms.c index c370c2d87c17..b4c679b3fb0f 100644 --- a/drivers/media/video/pms.c +++ b/drivers/media/video/pms.c @@ -26,6 +26,7 @@ #include <linux/fs.h> #include <linux/kernel.h> #include <linux/mm.h> +#include <linux/slab.h> #include <linux/ioport.h> #include <linux/init.h> #include <linux/mutex.h> |