From b3b7495435a18d362a704090b04e52b820a529bf Mon Sep 17 00:00:00 2001 From: Geoff Levand Date: Wed, 12 Oct 2011 08:42:13 +0000 Subject: [PATCH] --- yaml --- r: 275351 b: refs/heads/master c: 9fce85f7ff94f1a877c15ad3d6ffbaed4b5cd1a6 h: refs/heads/master i: 275349: 054ed4c5aa03a72e47c3262ffd58f4002f83172b 275347: 4f436b5b6828f2b4a5f8063d503cffd6bc58544b 275343: 800785f599a4d95c51671867fd59b76a86979475 v: v3 --- [refs] | 2 +- trunk/arch/powerpc/include/asm/lv1call.h | 2 +- trunk/sound/ppc/snd_ps3.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 26953b1e5163..44d1a7b8e2a3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5233e26ebb90242e3691c185ddda02dc83649e7d +refs/heads/master: 9fce85f7ff94f1a877c15ad3d6ffbaed4b5cd1a6 diff --git a/trunk/arch/powerpc/include/asm/lv1call.h b/trunk/arch/powerpc/include/asm/lv1call.h index 9cd5fc828a37..f77c708c67a0 100644 --- a/trunk/arch/powerpc/include/asm/lv1call.h +++ b/trunk/arch/powerpc/include/asm/lv1call.h @@ -316,7 +316,7 @@ LV1_CALL(gpu_context_free, 1, 0, 218 ) LV1_CALL(gpu_context_iomap, 5, 0, 221 ) LV1_CALL(gpu_context_attribute, 6, 0, 225 ) LV1_CALL(gpu_context_intr, 1, 1, 227 ) -LV1_CALL(gpu_attribute, 5, 0, 228 ) +LV1_CALL(gpu_attribute, 3, 0, 228 ) LV1_CALL(get_rtc, 0, 2, 232 ) LV1_CALL(set_ppe_periodic_tracer_frequency, 1, 0, 240 ) LV1_CALL(start_ppe_periodic_tracer, 5, 0, 241 ) diff --git a/trunk/sound/ppc/snd_ps3.c b/trunk/sound/ppc/snd_ps3.c index a3ce1b22620d..1aa52eff526a 100644 --- a/trunk/sound/ppc/snd_ps3.c +++ b/trunk/sound/ppc/snd_ps3.c @@ -876,7 +876,7 @@ static void __devinit snd_ps3_audio_set_base_addr(uint64_t ioaddr_start) (0x0fUL << 12) | (PS3_AUDIO_IOID); - ret = lv1_gpu_attribute(0x100, 0x007, val, 0, 0); + ret = lv1_gpu_attribute(0x100, 0x007, val); if (ret) pr_info("%s: gpu_attribute failed %d\n", __func__, ret);