From 18d57884842aff062c5654e36620942c43e4bc48 Mon Sep 17 00:00:00 2001 From: Xinyu Chen Date: Thu, 6 Sep 2012 13:05:01 +0800 Subject: ENGR00223226 irq: Disable GPU IRQ trigger for governor to save power This commit resolve the merge error. As PDK's IRQ trigger is enabled, so during merge 3way merge will combine them together, brings redundant codes. Signed-off-by: Xinyu Chen --- arch/arm/mach-mx6/irq.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/arch/arm/mach-mx6/irq.c b/arch/arm/mach-mx6/irq.c index 0498cd90e8e8..c5cad62c3069 100644 --- a/arch/arm/mach-mx6/irq.c +++ b/arch/arm/mach-mx6/irq.c @@ -64,14 +64,6 @@ static struct irq_tuner mxc_irq_tuner[] = { .irq_number = 43, /* GPU VG */ .up_threshold = 0, .enable = 0,}, - { - .irq_number = 42, /* GPU 2D */ - .up_threshold = 40, - .enable = 1,}, - { - .irq_number = 43, /* GPU VG */ - .up_threshold = 0, - .enable = 1,}, { .irq_number = 54, /* uSDHC1 */ .up_threshold = 4, -- cgit v1.2.3