diff options
| author |   Takashi Iwai <tiwai@suse.de> | 2013-08-15 20:43:46 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2013-08-15 20:43:46 +0200 |
| commit | f85a6597a6ce33fe4f390744b2764b30aa7bfda8 (patch) | |
| tree | 9b923afc20e7d3a7e78f98d600fd7e6633b4265b /arch/s390/mm/init.c | |
| parent | ALSA: usb-audio: Fix invalid volume resolution for Logitech HD Webcam C525 (diff) | |
| parent | Merge remote-tracking branch 'asoc/fix/tegra' into asoc-linus (diff) | |
| download | linux-dev-f85a6597a6ce33fe4f390744b2764b30aa7bfda8.tar.xz linux-dev-f85a6597a6ce33fe4f390744b2764b30aa7bfda8.zip | |
Merge tag 'asoc-v3.11-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v3.11
A few driver specific fixes here plus one core fix for a memory
corruption issue in DAPM initialisation which could lead to crashes.
Diffstat (limited to 'arch/s390/mm/init.c')
| -rw-r--r-- | arch/s390/mm/init.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/s390/mm/init.c b/arch/s390/mm/init.c index ce36ea80e4f9..ad446b0c55b6 100644 --- a/arch/s390/mm/init.c +++ b/arch/s390/mm/init.c @@ -69,6 +69,7 @@ static void __init setup_zero_pages(void) order = 2; break; case 0x2827: /* zEC12 */ + case 0x2828: /* zEC12 */ default: order = 5; break; |