diff options
author | Takashi Iwai <tiwai@suse.de> | 2013-04-03 15:07:29 (GMT) |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2013-04-03 15:07:29 (GMT) |
commit | efc33ce197e4b6aaddf1eb2ba6293f51daf3c283 (patch) | |
tree | 9eaceed3c855d5cbc91c2fc247bdcceafbf28cdf /arch/alpha/boot/head.S | |
parent | 993884f6a26c6547fa3875f9d3fabdc4250d8da6 (diff) | |
parent | 690a863ff03d9a29ace2b752b8f802fba78a842f (diff) | |
download | linux-efc33ce197e4b6aaddf1eb2ba6293f51daf3c283.tar.xz |
Merge branch 'for-linus' into for-next
Back-merge for cleaning up usb-audio code the recent commit modified,
and further UAC2 autoclock patches.
Diffstat (limited to 'arch/alpha/boot/head.S')
-rw-r--r-- | arch/alpha/boot/head.S | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/alpha/boot/head.S b/arch/alpha/boot/head.S index b06812b..8efb266 100644 --- a/arch/alpha/boot/head.S +++ b/arch/alpha/boot/head.S @@ -4,6 +4,7 @@ * initial bootloader stuff.. */ +#include <asm/pal.h> .set noreorder .globl __start |