diff options
| author | David S. Miller <davem@davemloft.net> | 2008-05-15 03:34:44 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-05-15 03:34:44 -0400 |
| commit | 63fe46da9c380b3f2bbdf3765044649517cc717c (patch) | |
| tree | 9478c1aca1d692b408955aea20c9cd9a37e589c0 /arch/arm/mach-pxa/spitz_pm.c | |
| parent | 99dd1a2b8347ac2ae802300b7862f6f7bcf17139 (diff) | |
| parent | 066b2118976e6e7cc50eed39e2747c75343a23c4 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/wireless/iwlwifi/iwl-4965-rs.c
drivers/net/wireless/rt2x00/rt61pci.c
Diffstat (limited to 'arch/arm/mach-pxa/spitz_pm.c')
| -rw-r--r-- | arch/arm/mach-pxa/spitz_pm.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/arm/mach-pxa/spitz_pm.c b/arch/arm/mach-pxa/spitz_pm.c index 7a7f5f947cc5..23f050feb208 100644 --- a/arch/arm/mach-pxa/spitz_pm.c +++ b/arch/arm/mach-pxa/spitz_pm.c | |||
| @@ -119,9 +119,6 @@ static void spitz_presuspend(void) | |||
| 119 | /* nRESET_OUT Disable */ | 119 | /* nRESET_OUT Disable */ |
| 120 | PSLR |= PSLR_SL_ROD; | 120 | PSLR |= PSLR_SL_ROD; |
| 121 | 121 | ||
| 122 | /* Clear reset status */ | ||
| 123 | RCSR = RCSR_HWR | RCSR_WDR | RCSR_SMR | RCSR_GPR; | ||
| 124 | |||
| 125 | /* Stop 3.6MHz and drive HIGH to PCMCIA and CS */ | 122 | /* Stop 3.6MHz and drive HIGH to PCMCIA and CS */ |
| 126 | PCFR = PCFR_GPR_EN | PCFR_OPDE; | 123 | PCFR = PCFR_GPR_EN | PCFR_OPDE; |
| 127 | } | 124 | } |