diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-03-13 16:57:17 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-03-13 16:57:17 +1100 |
| commit | c06ab71e9852d00150f82a26bcdfa5657911a9c5 (patch) | |
| tree | a186847292d74610f5f07035837877b39b1fa5fb /drivers/scsi/aacraid/commsup.c | |
| parent | 26a9fe3d937ea501f9c0c100a1b0f159551fd963 (diff) | |
| parent | 6fcc0ef3af13bcdb603250755b916e423ce4b065 (diff) | |
Merge commit 'semaphore/semaphore'
Conflicts:
Documentation/feature-removal-schedule.txt
drivers/base/core.c
drivers/firewire/fw-device.c
Diffstat (limited to 'drivers/scsi/aacraid/commsup.c')
| -rw-r--r-- | drivers/scsi/aacraid/commsup.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/aacraid/commsup.c b/drivers/scsi/aacraid/commsup.c index 47434499e82b..375383514e63 100644 --- a/drivers/scsi/aacraid/commsup.c +++ b/drivers/scsi/aacraid/commsup.c @@ -41,11 +41,11 @@ #include <linux/delay.h> #include <linux/kthread.h> #include <linux/interrupt.h> +#include <linux/semaphore.h> #include <scsi/scsi.h> #include <scsi/scsi_host.h> #include <scsi/scsi_device.h> #include <scsi/scsi_cmnd.h> -#include <asm/semaphore.h> #include "aacraid.h" |