From: Geert Uytterhoeven <geert@linux-m68k.org>
Date: Mon, 10 Mar 2014 20:20:55 +0000 (+0100)
Subject: Revert "ALSA: emu10k1: Fix warning: "CCR" redefined"
X-Git-Tag: v3.15-rc1~142^2~3^2~14
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f1eaaf8fce87adfcaaa9e44459cb25c2dbe3dcd3;p=pandora-kernel.git

Revert "ALSA: emu10k1: Fix warning: "CCR" redefined"

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>
---

Reading git-diff-tree failed