diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-05-01 17:24:05 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-05-01 17:24:05 -0700 |
| commit | 208d501708c4397898fc440ac8cc68537538e39e (patch) | |
| tree | c7a58e677723699b1ea5da09ba7a47a06a42cce2 /arch/mips/ath79/dev-wmac.c | |
| parent | 655861e328cea83320190f4a57b3656ee952388c (diff) | |
| parent | dc5efaa049cbb10efaf47fe977d45ea1e38b4465 (diff) | |
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
Pull MIPS fixes from Ralf Baechle:
"misc fixes some of which are also applicable to 3.3 and removal of an
unused function. This has been sitting in -next for ages with no
complaints. Also there are no known regressions due to these patches"
* 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus:
MIPS: Remove get_current_pgd().
MIPS: ath79: fix AR933X WMAC reset code
MIPS: JZ4740: Fix the JZ4740_IRQ_DMA macro
MIPS: Use set_current_blocked() and block_sigmask()
Diffstat (limited to 'arch/mips/ath79/dev-wmac.c')
| -rw-r--r-- | arch/mips/ath79/dev-wmac.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/ath79/dev-wmac.c b/arch/mips/ath79/dev-wmac.c index e2150705206..9c717bf98ff 100644 --- a/arch/mips/ath79/dev-wmac.c +++ b/arch/mips/ath79/dev-wmac.c @@ -58,8 +58,8 @@ static void __init ar913x_wmac_setup(void) static int ar933x_wmac_reset(void) { - ath79_device_reset_clear(AR933X_RESET_WMAC); ath79_device_reset_set(AR933X_RESET_WMAC); + ath79_device_reset_clear(AR933X_RESET_WMAC); return 0; } |