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/cavium-octeon/csrc-octeon.c | |
| parent | ALSA: usb-audio: support wireless devices in snd_usb_parse_datainterval (diff) | |
| parent | ALSA: hda - hdmi: Fix channel map switch not taking effect (diff) | |
| download | linux-d820306cbe56fb010f500ae58f9725f49812d39a.tar.xz linux-d820306cbe56fb010f500ae58f9725f49812d39a.zip | |
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/cavium-octeon/csrc-octeon.c')
| -rw-r--r-- | arch/mips/cavium-octeon/csrc-octeon.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/mips/cavium-octeon/csrc-octeon.c b/arch/mips/cavium-octeon/csrc-octeon.c index 02193953eb9e..b752c4ed0b79 100644 --- a/arch/mips/cavium-octeon/csrc-octeon.c +++ b/arch/mips/cavium-octeon/csrc-octeon.c @@ -12,6 +12,7 @@ #include <linux/smp.h> #include <asm/cpu-info.h> +#include <asm/cpu-type.h> #include <asm/time.h> #include <asm/octeon/octeon.h> |