diff --git a/[refs] b/[refs]
index 8a0c7e23f553..5ef329426509 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 29775df10f02f614db870ff4acaf0b07dbed1547
+refs/heads/master: 30377642138aadeef35a31c2f90dba0b6fa7b91a
diff --git a/trunk/drivers/sh/intc/chip.c b/trunk/drivers/sh/intc/chip.c
index d90cb7e43920..db10adf63dd7 100644
--- a/trunk/drivers/sh/intc/chip.c
+++ b/trunk/drivers/sh/intc/chip.c
@@ -73,7 +73,7 @@ static int intc_set_affinity(struct irq_data *data,
 
 	cpumask_copy(data->affinity, cpumask);
 
-	return 0;
+	return IRQ_SET_MASK_OK_NOCOPY;
 }
 #endif