From 2b791a9592e15fafe60b5c0b8fb97e27a3c39e9c Mon Sep 17 00:00:00 2001 From: Thomas Gleixner Date: Sun, 27 Mar 2011 15:11:13 +0200 Subject: [PATCH] --- yaml --- r: 243327 b: refs/heads/master c: 9efbc3fba2cd7f703b55d72e5168ed4348930442 h: refs/heads/master i: 243325: cc9da1bccc6d387a80a79c275fd0aec15cf76414 243323: 194e0a92ff862392743de229015c5ad5dd33ca82 243319: 8c13cfc9b006435adcb3cd6b61276983d8e2e36b 243311: d01e96fc1e85fd3f9617c43bf014b8bfa7596283 243295: d63a718dfaea04add5195168c0f4ce79d44bb403 243263: 0195967ca7cca4dd36f0f11f831fc75085fc0f93 243199: c9c8f67b8e1dce082cbcaa32b97f8bbaca99ec65 v: v3 --- [refs] | 2 +- trunk/arch/mips/alchemy/devboards/db1200/setup.c | 13 ++++++------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index caa664bd9108..21f532227680 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5b7cd6fd8278a754df6495fcc5cfa4dd3df42206 +refs/heads/master: 9efbc3fba2cd7f703b55d72e5168ed4348930442 diff --git a/trunk/arch/mips/alchemy/devboards/db1200/setup.c b/trunk/arch/mips/alchemy/devboards/db1200/setup.c index 887619547553..a4e04004b03c 100644 --- a/trunk/arch/mips/alchemy/devboards/db1200/setup.c +++ b/trunk/arch/mips/alchemy/devboards/db1200/setup.c @@ -70,13 +70,12 @@ static int __init db1200_arch_init(void) * issues they must not be automatically enabled when initially * requested. */ - irq_to_desc(DB1200_SD0_INSERT_INT)->status |= IRQ_NOAUTOEN; - irq_to_desc(DB1200_SD0_EJECT_INT)->status |= IRQ_NOAUTOEN; - irq_to_desc(DB1200_PC0_INSERT_INT)->status |= IRQ_NOAUTOEN; - irq_to_desc(DB1200_PC0_EJECT_INT)->status |= IRQ_NOAUTOEN; - irq_to_desc(DB1200_PC1_INSERT_INT)->status |= IRQ_NOAUTOEN; - irq_to_desc(DB1200_PC1_EJECT_INT)->status |= IRQ_NOAUTOEN; - + irq_set_status_flags(DB1200_SD0_INSERT_INT, IRQ_NOAUTOEN); + irq_set_status_flags(DB1200_SD0_EJECT_INT, IRQ_NOAUTOEN); + irq_set_status_flags(DB1200_PC0_INSERT_INT, IRQ_NOAUTOEN); + irq_set_status_flags(DB1200_PC0_EJECT_INT, IRQ_NOAUTOEN); + irq_set_status_flags(DB1200_PC1_INSERT_INT, IRQ_NOAUTOEN); + irq_set_status_flags(DB1200_PC1_EJECT_INT, IRQ_NOAUTOEN); return 0; } arch_initcall(db1200_arch_init);