diff options
| author | Takashi Iwai <tiwai@suse.de> | 2012-04-07 06:28:00 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2012-04-07 06:28:00 -0400 |
| commit | c38f62b08d800104fa9b0e9d6e9141459986c06d (patch) | |
| tree | 1d04d768c8aa0c1a544d1f068317c7beb0101be2 /scripts/patch-kernel | |
| parent | 250f32747e62cb415b85083e247184188f24e566 (diff) | |
| parent | 8abe05c6eb358967f16bce8a02c88d57c82cfbd6 (diff) | |
Merge tag 'asoc-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: fixes for 3.4
A bunch of driver-specific fixes and one generic fix for the new support
for platform DAPM contexts - we were picking the wrong default for the
idle_bias_off setting which was meaning we weren't actually achieving
any useful runtime PM on platform devices.
Diffstat (limited to 'scripts/patch-kernel')
| -rwxr-xr-x | scripts/patch-kernel | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/scripts/patch-kernel b/scripts/patch-kernel index 20fb25c23382..d000ea3a41fd 100755 --- a/scripts/patch-kernel +++ b/scripts/patch-kernel | |||
| @@ -116,6 +116,10 @@ findFile () { | |||
| 116 | ext=".bz2" | 116 | ext=".bz2" |
| 117 | name="bzip2" | 117 | name="bzip2" |
| 118 | uncomp="bunzip2 -dc" | 118 | uncomp="bunzip2 -dc" |
| 119 | elif [ -r ${filebase}.xz ]; then | ||
| 120 | ext=".xz" | ||
| 121 | name="xz" | ||
| 122 | uncomp="xz -dc" | ||
| 119 | elif [ -r ${filebase}.zip ]; then | 123 | elif [ -r ${filebase}.zip ]; then |
| 120 | ext=".zip" | 124 | ext=".zip" |
| 121 | name="zip" | 125 | name="zip" |
