diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2011-10-09 21:51:23 -0400 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2011-10-09 21:51:23 -0400 |
| commit | d7f458fb20e39ee3ad4c51f159c255ee378c3ef6 (patch) | |
| tree | 4c0b84bacd5a12ef21f0e40b72a8be01aea537f6 | |
| parent | 7611ab5e7c7fe4fb2549b31626cd984ed2726000 (diff) | |
| download | longterm-queue-2.6.34-d7f458fb20e39ee3ad4c51f159c255ee378c3ef6.tar.gz | |
ALSA: fix powermac build failure
The above 2 patches in the series file cause a compile failure.
Maybe on the 32 baseline it still works but not on 34. Add the
patch to give of_machine_is_compatible from upstream.
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -rw-r--r-- | queue/ALSA-powermac-Fix-obsoleted-machine_is_compatible.patch | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/queue/ALSA-powermac-Fix-obsoleted-machine_is_compatible.patch b/queue/ALSA-powermac-Fix-obsoleted-machine_is_compatible.patch new file mode 100644 index 0000000..4009ec4 --- /dev/null +++ b/queue/ALSA-powermac-Fix-obsoleted-machine_is_compatible.patch @@ -0,0 +1,28 @@ +From 75296367fde6ff6674bff2d336e2f4a7b6abbf9e Mon Sep 17 00:00:00 2001 +From: Takashi Iwai <tiwai@suse.de> +Date: Wed, 7 Apr 2010 07:45:46 +0200 +Subject: [PATCH] ALSA: powermac - Fix obsoleted machine_is_compatible() + +commit 68c7ccb8f85801655aa681391dc0ee037a2b66d4 upstream. + +machine_is_compatible() was renamed to of_machine_is_compatible(). + +Signed-off-by: Takashi Iwai <tiwai@suse.de> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> + +diff --git a/sound/ppc/tumbler.c b/sound/ppc/tumbler.c +index 696280c..31efa21 100644 +--- a/sound/ppc/tumbler.c ++++ b/sound/ppc/tumbler.c +@@ -47,7 +47,7 @@ + #define DBG(fmt...) + #endif + +-#define IS_G4DA (machine_is_compatible("PowerMac3,4")) ++#define IS_G4DA (of_machine_is_compatible("PowerMac3,4")) + + /* i2c address for tumbler */ + #define TAS_I2C_ADDR 0x34 +-- +1.7.7 + |