diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-03-23 23:44:19 -0500 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-03-23 23:44:19 -0500 |
| commit | 1ebbe2b20091d306453a5cf480a87e6cd28ae76f (patch) | |
| tree | f5cd7a0fa69b8b1938cb5a0faed2e7b0628072a5 /net/atm/resources.h | |
| parent | ac58c9059da8886b5e8cde012a80266b18ca146e (diff) | |
| parent | 674a396c6d2ba0341ebdd7c1c9950f32f018e2dd (diff) | |
Merge branch 'linus'
Diffstat (limited to 'net/atm/resources.h')
| -rw-r--r-- | net/atm/resources.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/atm/resources.h b/net/atm/resources.h index b7fb82a93b42..ac7222fee7a8 100644 --- a/net/atm/resources.h +++ b/net/atm/resources.h | |||
| @@ -8,10 +8,11 @@ | |||
| 8 | 8 | ||
| 9 | #include <linux/config.h> | 9 | #include <linux/config.h> |
| 10 | #include <linux/atmdev.h> | 10 | #include <linux/atmdev.h> |
| 11 | #include <linux/mutex.h> | ||
| 11 | 12 | ||
| 12 | 13 | ||
| 13 | extern struct list_head atm_devs; | 14 | extern struct list_head atm_devs; |
| 14 | extern struct semaphore atm_dev_mutex; | 15 | extern struct mutex atm_dev_mutex; |
| 15 | 16 | ||
| 16 | int atm_dev_ioctl(unsigned int cmd, void __user *arg); | 17 | int atm_dev_ioctl(unsigned int cmd, void __user *arg); |
| 17 | 18 | ||