diff options
| author | Takashi Iwai <tiwai@suse.de> | 2013-10-08 09:30:04 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2013-10-08 09:30:04 +0200 |
| commit | d820306cbe56fb010f500ae58f9725f49812d39a (patch) | |
| tree | 1c9554107c7f279d05d6f54b1b5d69735d51195d /arch/mips/mm/page.c | |
| parent | 6d5eba5aac4ec9bba3d6b3e6425d857706d12ccb (diff) | |
| parent | 39edac70e9aedf451fccaa851b273ace9fcca0bd (diff) | |
| download | linux-d820306cbe56fb010f500ae58f9725f49812d39a.tar.bz2 | |
Merge branch 'for-linus' into for-next
For updating the HDMI chmap fix.
Conflicts:
sound/pci/hda/patch_hdmi.c
Diffstat (limited to 'arch/mips/mm/page.c')
| -rw-r--r-- | arch/mips/mm/page.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/mips/mm/page.c b/arch/mips/mm/page.c index 218c2109a55d..cbd81d17793a 100644 --- a/arch/mips/mm/page.c +++ b/arch/mips/mm/page.c @@ -18,6 +18,7 @@ #include <asm/bugs.h> #include <asm/cacheops.h> +#include <asm/cpu-type.h> #include <asm/inst.h> #include <asm/io.h> #include <asm/page.h> |