diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-11-06 10:46:18 -0500 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-11-06 10:46:18 -0500 |
commit | 330f28f691e9b349e34adcaf82b273cf061bb491 (patch) | |
tree | fca3bfe41eff25ef19f576cef1979c68f6521af5 /drivers/net/eql.c | |
parent | fe3e78e073d25308756f38019956061153267769 (diff) | |
parent | 6fc786d5034ed7ce2d43c459211137de6d99dd28 (diff) |
Merge branch 'for-2.6.32' into for-2.6.33
Diffstat (limited to 'drivers/net/eql.c')
-rw-r--r-- | drivers/net/eql.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/eql.c b/drivers/net/eql.c index d4d9a3eda695..f5b96cadeb25 100644 --- a/drivers/net/eql.c +++ b/drivers/net/eql.c | |||
@@ -111,6 +111,7 @@ | |||
111 | * Sorry, I had to rewrite most of this for 2.5.x -DaveM | 111 | * Sorry, I had to rewrite most of this for 2.5.x -DaveM |
112 | */ | 112 | */ |
113 | 113 | ||
114 | #include <linux/capability.h> | ||
114 | #include <linux/module.h> | 115 | #include <linux/module.h> |
115 | #include <linux/kernel.h> | 116 | #include <linux/kernel.h> |
116 | #include <linux/init.h> | 117 | #include <linux/init.h> |