diff options
author | James Morris <jmorris@namei.org> | 2011-11-16 12:39:48 +1100 |
---|---|---|
committer | James Morris <jmorris@namei.org> | 2011-11-16 12:39:48 +1100 |
commit | 24942c8e5cc8696064ee207ff29d4cf21f70dafc (patch) | |
tree | 08a8221eb72ec3da7746d7d76f6f5915ce77cde7 /drivers/of/of_spi.c | |
parent | e163bc8e4a0cd1cdffadb58253f7651201722d56 (diff) | |
parent | ff0ff78068dd8a962358dbbdafa9d6f24540d3e5 (diff) | |
download | linux-stable-24942c8e5cc8696064ee207ff29d4cf21f70dafc.tar.gz linux-stable-24942c8e5cc8696064ee207ff29d4cf21f70dafc.tar.bz2 linux-stable-24942c8e5cc8696064ee207ff29d4cf21f70dafc.zip |
Merge branch 'master'; commit 'v3.2-rc2' into next
Diffstat (limited to 'drivers/of/of_spi.c')
-rw-r--r-- | drivers/of/of_spi.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/of/of_spi.c b/drivers/of/of_spi.c index 1dbce58a58b0..6dbc074e4876 100644 --- a/drivers/of/of_spi.c +++ b/drivers/of/of_spi.c @@ -6,6 +6,7 @@ * tree. */ +#include <linux/module.h> #include <linux/of.h> #include <linux/device.h> #include <linux/spi/spi.h> |