diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-14 19:06:58 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-14 19:06:58 -0400 |
commit | 85082fd7cbe3173198aac0eb5e85ab1edcc6352c (patch) | |
tree | edbc09b7945994f78668d218fa02e991c3b3b365 /arch/arm/mach-pxa/generic.c | |
parent | 666484f0250db2e016948d63b3ef33e202e3b8d0 (diff) | |
parent | 53ffe3b440aa85af6fc4eda09b2d44bcdd312d4d (diff) |
Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm
* 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm: (241 commits)
[ARM] 5171/1: ep93xx: fix compilation of modules using clocks
[ARM] 5133/2: at91sam9g20 defconfig file
[ARM] 5130/4: Support for the at91sam9g20
[ARM] 5160/1: IOP3XX: gpio/gpiolib support
[ARM] at91: Fix NAND FLASH timings for at91sam9x evaluation kits.
[ARM] 5084/1: zylonite: Register AC97 device
[ARM] 5085/2: PXA: Move AC97 over to the new central device declaration model
[ARM] 5120/1: pxa: correct platform driver names for PXA25x and PXA27x UDC drivers
[ARM] 5147/1: pxaficp_ir: drop pxa_gpio_mode calls, as pin setting
[ARM] 5145/1: PXA2xx: provide api to control IrDA pins state
[ARM] 5144/1: pxaficp_ir: cleanup includes
[ARM] pxa: remove pxa_set_cken()
[ARM] pxa: allow clk aliases
[ARM] Feroceon: don't disable BPU on boot
[ARM] Orion: LED support for HP mv2120
[ARM] Orion: add RD88F5181L-FXO support
[ARM] Orion: add RD88F5181L-GE support
[ARM] Orion: add Netgear WNR854T support
[ARM] s3c2410_defconfig: update for current build
[ARM] Acer n30: Minor style and indentation fixes.
...
Diffstat (limited to 'arch/arm/mach-pxa/generic.c')
-rw-r--r-- | arch/arm/mach-pxa/generic.c | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/arch/arm/mach-pxa/generic.c b/arch/arm/mach-pxa/generic.c index 44617938f3f1..ca053226fba0 100644 --- a/arch/arm/mach-pxa/generic.c +++ b/arch/arm/mach-pxa/generic.c | |||
@@ -60,23 +60,6 @@ unsigned int get_memclk_frequency_10khz(void) | |||
60 | EXPORT_SYMBOL(get_memclk_frequency_10khz); | 60 | EXPORT_SYMBOL(get_memclk_frequency_10khz); |
61 | 61 | ||
62 | /* | 62 | /* |
63 | * Routine to safely enable or disable a clock in the CKEN | ||
64 | */ | ||
65 | void __pxa_set_cken(int clock, int enable) | ||
66 | { | ||
67 | unsigned long flags; | ||
68 | local_irq_save(flags); | ||
69 | |||
70 | if (enable) | ||
71 | CKEN |= (1 << clock); | ||
72 | else | ||
73 | CKEN &= ~(1 << clock); | ||
74 | |||
75 | local_irq_restore(flags); | ||
76 | } | ||
77 | EXPORT_SYMBOL(__pxa_set_cken); | ||
78 | |||
79 | /* | ||
80 | * Intel PXA2xx internal register mapping. | 63 | * Intel PXA2xx internal register mapping. |
81 | * | 64 | * |
82 | * Note 1: not all PXA2xx variants implement all those addresses. | 65 | * Note 1: not all PXA2xx variants implement all those addresses. |