git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 5be50ac)
Revert "ALSA: emu10k1: Fix warning: "CCR" redefined"
authorGeert Uytterhoeven <geert@linux-m68k.org>
Mon, 10 Mar 2014 20:20:55 +0000 (21:20 +0100)
committerTakashi Iwai <tiwai@suse.de>
Tue, 11 Mar 2014 06:54:14 +0000 (07:54 +0100)
This reverts commit 83fc3bc09518d42e8f5073e2a65884701dfadf19.

sh-specific "CCR" and "CCR2" have been prefixed by "SH_" in commit
a5f6ea29f9a918403629f8369ae55fac6b09cb53 ('sh: prefix sh-specific "CCR" and
"CCR2" by "SH_"').

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
include/sound/emu10k1.h patch | blob | history

diff --cc include/sound/emu10k1.h
Simple merge
Pandora Kernel Repository