diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-03-04 17:20:31 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-03-04 17:22:38 +1100 |
| commit | 42dc29ce81a3fe94810eacdabac2634db38b4982 (patch) | |
| tree | 1cfe09a7afbd15af6a9a104bfa671fc24b75d58d /drivers/media/video/pvrusb2/pvrusb2-context.c | |
| parent | 450c2bc68f128ea2890844fdd7f374ddee489f71 (diff) | |
| parent | 890f841dac014ee441cf8471efb9db666d34a6de (diff) | |
Merge commit 'semaphore/semaphore'
Conflicts:
Documentation/feature-removal-schedule.txt
drivers/char/xilinx_hwicap/xilinx_hwicap.c
include/linux/memory.h
Diffstat (limited to 'drivers/media/video/pvrusb2/pvrusb2-context.c')
| -rw-r--r-- | drivers/media/video/pvrusb2/pvrusb2-context.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/media/video/pvrusb2/pvrusb2-context.c b/drivers/media/video/pvrusb2/pvrusb2-context.c index 9d94aed2e12d..160437b21e6d 100644 --- a/drivers/media/video/pvrusb2/pvrusb2-context.c +++ b/drivers/media/video/pvrusb2/pvrusb2-context.c @@ -26,7 +26,6 @@ #include <linux/errno.h> #include <linux/string.h> #include <linux/slab.h> -#include <asm/semaphore.h> static void pvr2_context_destroy(struct pvr2_context *mp) |