diff options
| author | John W. Linville <linville@tuxdriver.com> | 2012-02-15 16:24:37 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-02-15 16:24:37 -0500 |
| commit | ca994a36f585432458ead9133fcfe05440edbb7b (patch) | |
| tree | be05512153a9cd5cbe1f1234bc09fd9cd388ec58 /arch/mips/alchemy/common/power.c | |
| parent | 12325280dfeba18164f9c47e226a40ab34e23ee7 (diff) | |
| parent | 2504a6423b9ab4c36df78227055995644de19edb (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
Conflicts:
net/mac80211/debugfs_sta.c
net/mac80211/sta_info.h
Diffstat (limited to 'arch/mips/alchemy/common/power.c')
| -rw-r--r-- | arch/mips/alchemy/common/power.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/mips/alchemy/common/power.c b/arch/mips/alchemy/common/power.c index bdd6651e9a4f..0c7fce2a3c12 100644 --- a/arch/mips/alchemy/common/power.c +++ b/arch/mips/alchemy/common/power.c @@ -126,6 +126,9 @@ void au_sleep(void) case ALCHEMY_CPU_AU1200: alchemy_sleep_au1550(); break; + case ALCHEMY_CPU_AU1300: + alchemy_sleep_au1300(); + break; } restore_core_regs(); |