diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-03-05 19:59:23 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-03-05 19:59:23 +1100 |
| commit | 639e0825e2ed99ac0d7534fc049324145f2d449d (patch) | |
| tree | 718f114c6ee71e6de41c70dd06c6f6d6b1d6d5e3 /include/asm-blackfin/dma.h | |
| parent | b4f57bbe194a83858d633d674913a2e02bf5e93b (diff) | |
| parent | dd7f90fb66bd2736c71f809558a841287130dc70 (diff) | |
Merge commit 'semaphore/semaphore'
Conflicts:
Documentation/feature-removal-schedule.txt
include/linux/memory.h
Diffstat (limited to 'include/asm-blackfin/dma.h')
| -rw-r--r-- | include/asm-blackfin/dma.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/asm-blackfin/dma.h b/include/asm-blackfin/dma.h index 5abaa2cee8db..16d493574ba8 100644 --- a/include/asm-blackfin/dma.h +++ b/include/asm-blackfin/dma.h @@ -33,7 +33,6 @@ #include <linux/slab.h> #include <asm/irq.h> #include <asm/signal.h> -#include <asm/semaphore.h> #include <linux/kernel.h> #include <asm/mach/dma.h> |