diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-07-13 16:23:51 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-07-13 16:23:51 -0400 |
| commit | 327309e899662b482c58cf25f574513d38b5788c (patch) | |
| tree | 069de438aa0e92dd9b6ba28e6b207e2cd07151a5 /drivers/message/i2o | |
| parent | 0c168775709faa74c1b87f1e61046e0c51ade7f3 (diff) | |
| parent | c32511e2718618f0b53479eb36e07439aa363a74 (diff) | |
Merge upstream 2.6.13-rc3 into ieee80211 branch of netdev-2.6.
Diffstat (limited to 'drivers/message/i2o')
| -rw-r--r-- | drivers/message/i2o/config-osm.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/message/i2o/config-osm.c b/drivers/message/i2o/config-osm.c index d0267609a949..fe2e7afc9eae 100644 --- a/drivers/message/i2o/config-osm.c +++ b/drivers/message/i2o/config-osm.c | |||
| @@ -15,7 +15,9 @@ | |||
| 15 | 15 | ||
| 16 | #include <linux/module.h> | 16 | #include <linux/module.h> |
| 17 | #include <linux/i2o.h> | 17 | #include <linux/i2o.h> |
| 18 | #include <linux/dcache.h> | ||
| 18 | #include <linux/namei.h> | 19 | #include <linux/namei.h> |
| 20 | #include <linux/fs.h> | ||
| 19 | 21 | ||
| 20 | #include <asm/uaccess.h> | 22 | #include <asm/uaccess.h> |
| 21 | 23 | ||