From cdc625b4b4e3212d7c958fb776182621760c122a Mon Sep 17 00:00:00 2001 From: Thomas Gleixner Date: Fri, 25 Mar 2011 16:26:01 +0100 Subject: [PATCH] --- yaml --- r: 243343 b: refs/heads/master c: 773e20d5b7bf948ab0207e1ddb81e52ae7e7c6f3 h: refs/heads/master i: 243341: a70c52930b105b89c9a8ae93de8e24862f34b9e1 243339: f8ecebd01adcbce387e55bca78275b9e22697f8e 243335: e99f2838f373b9f42ca5731b068d5563e2a7e38e 243327: 2b791a9592e15fafe60b5c0b8fb97e27a3c39e9c v: v3 --- [refs] | 2 +- trunk/arch/powerpc/sysdev/xilinx_intc.c | 6 ------ 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/[refs] b/[refs] index e9dcc821969e..85a4c691cf13 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1ac06cdadf3f6e9c52cf87304238bffdf4c71566 +refs/heads/master: 773e20d5b7bf948ab0207e1ddb81e52ae7e7c6f3 diff --git a/trunk/arch/powerpc/sysdev/xilinx_intc.c b/trunk/arch/powerpc/sysdev/xilinx_intc.c index 7436f3ed4df6..c5bb44410762 100644 --- a/trunk/arch/powerpc/sysdev/xilinx_intc.c +++ b/trunk/arch/powerpc/sysdev/xilinx_intc.c @@ -79,12 +79,6 @@ static void xilinx_intc_mask(struct irq_data *d) static int xilinx_intc_set_type(struct irq_data *d, unsigned int flow_type) { - struct irq_desc *desc = irq_to_desc(d->irq); - - desc->status &= ~(IRQ_TYPE_SENSE_MASK | IRQ_LEVEL); - desc->status |= flow_type & IRQ_TYPE_SENSE_MASK; - if (flow_type & (IRQ_TYPE_LEVEL_HIGH | IRQ_TYPE_LEVEL_LOW)) - desc->status |= IRQ_LEVEL; return 0; }