diff options
| author | Jens Axboe <axboe@kernel.dk> | 2013-07-02 02:31:48 -0400 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2013-07-02 02:31:48 -0400 |
| commit | 5f0e5afa0de4522abb3ea7d1369039b94e740ec5 (patch) | |
| tree | 6a5be3db9ecfed8ef2150c6146f6d1e0d658ac8b /arch/mips/loongson1/common/reset.c | |
| parent | d752b2696072ed52fd5afab08b601e2220a3b87e (diff) | |
| parent | 9e895ace5d82df8929b16f58e9f515f6d54ab82d (diff) | |
Merge tag 'v3.10-rc7' into for-3.11/drivers
Linux 3.10-rc7
Pull this in early to avoid doing it with the bcache merge,
since there are a number of changes to bcache between my old
base (3.10-rc1) and the new pull request.
Diffstat (limited to 'arch/mips/loongson1/common/reset.c')
| -rw-r--r-- | arch/mips/loongson1/common/reset.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/mips/loongson1/common/reset.c b/arch/mips/loongson1/common/reset.c index d4f610f9604a..547f34b69e4c 100644 --- a/arch/mips/loongson1/common/reset.c +++ b/arch/mips/loongson1/common/reset.c | |||
| @@ -9,6 +9,7 @@ | |||
| 9 | 9 | ||
| 10 | #include <linux/io.h> | 10 | #include <linux/io.h> |
| 11 | #include <linux/pm.h> | 11 | #include <linux/pm.h> |
| 12 | #include <asm/idle.h> | ||
| 12 | #include <asm/reboot.h> | 13 | #include <asm/reboot.h> |
| 13 | 14 | ||
| 14 | #include <loongson1.h> | 15 | #include <loongson1.h> |