diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-12-06 00:42:35 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-12-06 00:43:49 -0500 |
| commit | d6c1c49de577fa292af2449817364b7d89b574d8 (patch) | |
| tree | e97cf88a318f50eb23c18d790e8b0bcf7bb47169 /arch/powerpc/platforms/ps3/device-init.c | |
| parent | 9dde9dc0a81c7aeb863b35121d09011f09b4897c (diff) | |
| parent | ddf6e0e50723b62ac76ed18eb53e9417c6eefba7 (diff) | |
Merge branch 'perf/urgent' into perf/core
Merge reason: Add these cherry-picked commits so that future changes
on perf/core don't conflict.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/powerpc/platforms/ps3/device-init.c')
| -rw-r--r-- | arch/powerpc/platforms/ps3/device-init.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/platforms/ps3/device-init.c b/arch/powerpc/platforms/ps3/device-init.c index 6c4b5837fc8..3f175e8aedb 100644 --- a/arch/powerpc/platforms/ps3/device-init.c +++ b/arch/powerpc/platforms/ps3/device-init.c | |||
| @@ -825,7 +825,7 @@ static int ps3_probe_thread(void *data) | |||
| 825 | 825 | ||
| 826 | spin_lock_init(&dev.lock); | 826 | spin_lock_init(&dev.lock); |
| 827 | 827 | ||
| 828 | res = request_irq(irq, ps3_notification_interrupt, IRQF_DISABLED, | 828 | res = request_irq(irq, ps3_notification_interrupt, 0, |
| 829 | "ps3_notification", &dev); | 829 | "ps3_notification", &dev); |
| 830 | if (res) { | 830 | if (res) { |
| 831 | pr_err("%s:%u: request_irq failed %d\n", __func__, __LINE__, | 831 | pr_err("%s:%u: request_irq failed %d\n", __func__, __LINE__, |