diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2012-01-11 15:41:47 +0100 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2012-01-11 15:41:47 +0100 |
| commit | 39b741431af7f6f46b2e0e7f7f13ea2351fb4a5f (patch) | |
| tree | 89355f4ae7bbb874537bb65f71ba0d19b3d468e1 /arch/mips/alchemy/devboards/db1200 | |
| parent | Merge branch 'fixes-for-linus' into mips-for-linux-next (diff) | |
| parent | MIPS: Delete unused function add_temporary_entry. (diff) | |
| download | linux-39b741431af7f6f46b2e0e7f7f13ea2351fb4a5f.tar.xz linux-39b741431af7f6f46b2e0e7f7f13ea2351fb4a5f.zip | |
Merge branch 'next/generic' into mips-for-linux-next
Diffstat (limited to 'arch/mips/alchemy/devboards/db1200')
| -rw-r--r-- | arch/mips/alchemy/devboards/db1200/platform.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/mips/alchemy/devboards/db1200/platform.c b/arch/mips/alchemy/devboards/db1200/platform.c index c61867c93c4a..78459c17c628 100644 --- a/arch/mips/alchemy/devboards/db1200/platform.c +++ b/arch/mips/alchemy/devboards/db1200/platform.c @@ -276,12 +276,12 @@ static int db1200_mmc_cd_setup(void *mmc_host, int en) if (en) { ret = request_irq(DB1200_SD0_INSERT_INT, db1200_mmc_cd, - IRQF_DISABLED, "sd_insert", mmc_host); + 0, "sd_insert", mmc_host); if (ret) goto out; ret = request_irq(DB1200_SD0_EJECT_INT, db1200_mmc_cd, - IRQF_DISABLED, "sd_eject", mmc_host); + 0, "sd_eject", mmc_host); if (ret) { free_irq(DB1200_SD0_INSERT_INT, mmc_host); goto out; |