aboutsummaryrefslogtreecommitdiffstats
path: root/arch/s390/include/asm/cio.h
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2012-11-13 01:48:07 -0500
committerTakashi Iwai <tiwai@suse.de>2012-11-13 01:48:07 -0500
commit6214b54cbf0778804de1297444c7661e70bc4d74 (patch)
tree262a96d1be839a30e6e8d3f3452806b7f337148c /arch/s390/include/asm/cio.h
parent05193639ca977cc889668718adb38db6d585045b (diff)
parentba027da8eb309252cb611f23808da51487f68e12 (diff)
Merge tag 'asoc-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v3.7 A few small fixes plus a large but simple change for WM5102 which writes out a bunch of register updates to the device when we enable the clock as recommended following chip evaluation.
Diffstat (limited to 'arch/s390/include/asm/cio.h')
-rw-r--r--arch/s390/include/asm/cio.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/s390/include/asm/cio.h b/arch/s390/include/asm/cio.h
index 55bde6035216..ad2b924167d7 100644
--- a/arch/s390/include/asm/cio.h
+++ b/arch/s390/include/asm/cio.h
@@ -9,6 +9,8 @@
9 9
10#define LPM_ANYPATH 0xff 10#define LPM_ANYPATH 0xff
11#define __MAX_CSSID 0 11#define __MAX_CSSID 0
12#define __MAX_SUBCHANNEL 65535
13#define __MAX_SSID 3
12 14
13#include <asm/scsw.h> 15#include <asm/scsw.h>
14 16