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 /fs/compat_ioctl.c | |
| parent | ac58c9059da8886b5e8cde012a80266b18ca146e (diff) | |
| parent | 674a396c6d2ba0341ebdd7c1c9950f32f018e2dd (diff) | |
Merge branch 'linus'
Diffstat (limited to 'fs/compat_ioctl.c')
| -rw-r--r-- | fs/compat_ioctl.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/compat_ioctl.c b/fs/compat_ioctl.c index c666769a875d..7c031f00fd79 100644 --- a/fs/compat_ioctl.c +++ b/fs/compat_ioctl.c | |||
| @@ -72,6 +72,7 @@ | |||
| 72 | #include <linux/i2c-dev.h> | 72 | #include <linux/i2c-dev.h> |
| 73 | #include <linux/wireless.h> | 73 | #include <linux/wireless.h> |
| 74 | #include <linux/atalk.h> | 74 | #include <linux/atalk.h> |
| 75 | #include <linux/blktrace_api.h> | ||
| 75 | 76 | ||
| 76 | #include <net/sock.h> /* siocdevprivate_ioctl */ | 77 | #include <net/sock.h> /* siocdevprivate_ioctl */ |
| 77 | #include <net/bluetooth/bluetooth.h> | 78 | #include <net/bluetooth/bluetooth.h> |