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/scsi/dpt/dpti_i2o.h | |
| 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/scsi/dpt/dpti_i2o.h')
| -rw-r--r-- | drivers/scsi/dpt/dpti_i2o.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/scsi/dpt/dpti_i2o.h b/drivers/scsi/dpt/dpti_i2o.h index 100b49baca7f..19406cea6d6a 100644 --- a/drivers/scsi/dpt/dpti_i2o.h +++ b/drivers/scsi/dpt/dpti_i2o.h @@ -21,7 +21,6 @@ #include <linux/i2o-dev.h> -#include <asm/semaphore.h> /* Needed for MUTEX init macros */ #include <linux/version.h> #include <linux/notifier.h> #include <asm/atomic.h> |