diff options
| author | John W. Linville <linville@tuxdriver.com> | 2011-11-22 20:05:46 +0100 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-11-22 20:05:46 +0100 |
| commit | 515db09338704a6ad7d27b5f1e33820d3052edd2 (patch) | |
| tree | 74f915531710303397d34069b325c2be7a5ac93c /arch/mips/rb532/setup.c | |
| parent | mac80211: fix RCU warnings in mesh (diff) | |
| parent | Linux 3.2-rc2 (diff) | |
| download | linux-515db09338704a6ad7d27b5f1e33820d3052edd2.tar.xz linux-515db09338704a6ad7d27b5f1e33820d3052edd2.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux
Conflicts:
drivers/net/wireless/iwlegacy/iwl-debugfs.c
drivers/net/wireless/iwlegacy/iwl-rx.c
drivers/net/wireless/iwlegacy/iwl-scan.c
drivers/net/wireless/iwlegacy/iwl-tx.c
include/net/bluetooth/bluetooth.h
Diffstat (limited to 'arch/mips/rb532/setup.c')
| -rw-r--r-- | arch/mips/rb532/setup.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/mips/rb532/setup.c b/arch/mips/rb532/setup.c index 50f530f5b602..d0c64e71d532 100644 --- a/arch/mips/rb532/setup.c +++ b/arch/mips/rb532/setup.c @@ -3,6 +3,7 @@ */ #include <linux/init.h> +#include <linux/export.h> #include <asm/bootinfo.h> #include <asm/reboot.h> |