diff options
author | Emmanuel Grumbach <emmanuel.grumbach@intel.com> | 2014-05-06 20:37:42 +0300 |
---|---|---|
committer | Emmanuel Grumbach <emmanuel.grumbach@intel.com> | 2014-05-06 20:37:42 +0300 |
commit | cebeb0f1885fa93c44be5d4e0b9b640210ff088c (patch) | |
tree | a33e4af4ddaa7a57f997ab9a2baceb48209670cd /drivers/base/attribute_container.c | |
parent | 939ecf6b14c46e3448411a934418311b492bfee4 (diff) | |
parent | 48d11dc37977614a461bfedddc52d1c651bc279f (diff) |
Merge remote-tracking branch 'wireless-next/master' into iwlwifi-next
Diffstat (limited to 'drivers/base/attribute_container.c')
-rw-r--r-- | drivers/base/attribute_container.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/base/attribute_container.c b/drivers/base/attribute_container.c index ecc1929d7f6a9..b84ca8f13f9e1 100644 --- a/drivers/base/attribute_container.c +++ b/drivers/base/attribute_container.c @@ -12,7 +12,6 @@ */ #include <linux/attribute_container.h> -#include <linux/init.h> #include <linux/device.h> #include <linux/kernel.h> #include <linux/slab.h> |