From e5bfe3edc153fbfc9878dcd412bef54e97c23403 Mon Sep 17 00:00:00 2001
From: Thomas Gleixner <tglx@linutronix.de>
Date: Sun, 6 Feb 2011 20:20:33 +0100
Subject: [PATCH] --- yaml --- r: 243359 b: refs/heads/master c:
 db3b3602b90bcdc220b48f473010a4663310d95d h: refs/heads/master i:   243357:
 a65b32fe6b6cfeeedc87c6d55a105947ed76679d   243355:
 622fd54ed67e79da2ce4186cbada2c158e4793ac   243351:
 f5d210b5067b743fd5ae5d49c353d8834ec3d903   243343:
 cdc625b4b4e3212d7c958fb776182621760c122a   243327:
 2b791a9592e15fafe60b5c0b8fb97e27a3c39e9c v: v3

---
 [refs]                              | 2 +-
 trunk/arch/frv/kernel/irq-mb93093.c | 1 -
 trunk/arch/frv/kernel/irq.c         | 6 ------
 3 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index d991999aedee..ce3d5d1aba4f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0b98b1636cf2e112216a5661a629606cde7b1c07
+refs/heads/master: db3b3602b90bcdc220b48f473010a4663310d95d
diff --git a/trunk/arch/frv/kernel/irq-mb93093.c b/trunk/arch/frv/kernel/irq-mb93093.c
index e45209031873..6451c2f1c15e 100644
--- a/trunk/arch/frv/kernel/irq-mb93093.c
+++ b/trunk/arch/frv/kernel/irq-mb93093.c
@@ -73,7 +73,6 @@ static struct irq_chip frv_fpga_pic = {
 	.mask		= frv_fpga_mask,
 	.mask_ack	= frv_fpga_mask_ack,
 	.unmask		= frv_fpga_unmask,
-	.end		= frv_fpga_end,
 };
 
 /*
diff --git a/trunk/arch/frv/kernel/irq.c b/trunk/arch/frv/kernel/irq.c
index 625136625a7f..d4ec2c6adb0f 100644
--- a/trunk/arch/frv/kernel/irq.c
+++ b/trunk/arch/frv/kernel/irq.c
@@ -118,18 +118,12 @@ static void frv_cpupic_unmask(unsigned int irqlevel)
 	__clr_MASK(irqlevel);
 }
 
-static void frv_cpupic_end(unsigned int irqlevel)
-{
-	__clr_MASK(irqlevel);
-}
-
 static struct irq_chip frv_cpu_pic = {
 	.name		= "cpu",
 	.ack		= frv_cpupic_ack,
 	.mask		= frv_cpupic_mask,
 	.mask_ack	= frv_cpupic_mask_ack,
 	.unmask		= frv_cpupic_unmask,
-	.end		= frv_cpupic_end,
 };
 
 /*