diff options
| author | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
|---|---|---|
| committer | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
| commit | ada47b5fe13d89735805b566185f4885f5a3f750 (patch) | |
| tree | 644b88f8a71896307d71438e9b3af49126ffb22b /drivers/scsi/atari_NCR5380.c | |
| parent | 43e98717ad40a4ae64545b5ba047c7b86aa44f4f (diff) | |
| parent | 3280f21d43ee541f97f8cda5792150d2dbec20d5 (diff) | |
Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master
Diffstat (limited to 'drivers/scsi/atari_NCR5380.c')
| -rw-r--r-- | drivers/scsi/atari_NCR5380.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/scsi/atari_NCR5380.c b/drivers/scsi/atari_NCR5380.c index 4240b05aef6d..158ebc3644d8 100644 --- a/drivers/scsi/atari_NCR5380.c +++ b/drivers/scsi/atari_NCR5380.c | |||
| @@ -651,6 +651,7 @@ static inline void NCR5380_print_phase(struct Scsi_Host *instance) | |||
| 651 | * interrupt or bottom half. | 651 | * interrupt or bottom half. |
| 652 | */ | 652 | */ |
| 653 | 653 | ||
| 654 | #include <linux/gfp.h> | ||
| 654 | #include <linux/workqueue.h> | 655 | #include <linux/workqueue.h> |
| 655 | #include <linux/interrupt.h> | 656 | #include <linux/interrupt.h> |
| 656 | 657 | ||