diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2007-05-16 16:50:37 -0400 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2007-05-16 16:50:37 -0400 |
| commit | 55d3ecab2d16be3525ba24a96ba3a67692af1f09 (patch) | |
| tree | 7e81977adbd73e154f53861d8577d3ab92611c8c /drivers/firewire/fw-ohci.c | |
| parent | 6684e323a236d40461f27d36b38c6b70aabc9e71 (diff) | |
| parent | 7b104bcb8e460e45a1aebe3da9b86aacdb4cab12 (diff) | |
Merge branch 'master' of /home/trondmy/kernel/linux-2.6/
Diffstat (limited to 'drivers/firewire/fw-ohci.c')
| -rw-r--r-- | drivers/firewire/fw-ohci.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/firewire/fw-ohci.c b/drivers/firewire/fw-ohci.c index 1f5c70461b8b..c17342d3e6fd 100644 --- a/drivers/firewire/fw-ohci.c +++ b/drivers/firewire/fw-ohci.c | |||
| @@ -26,6 +26,7 @@ | |||
| 26 | #include <linux/delay.h> | 26 | #include <linux/delay.h> |
| 27 | #include <linux/poll.h> | 27 | #include <linux/poll.h> |
| 28 | #include <linux/dma-mapping.h> | 28 | #include <linux/dma-mapping.h> |
| 29 | #include <linux/mm.h> | ||
| 29 | 30 | ||
| 30 | #include <asm/uaccess.h> | 31 | #include <asm/uaccess.h> |
| 31 | #include <asm/semaphore.h> | 32 | #include <asm/semaphore.h> |