diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-03-12 20:56:37 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-03-12 20:56:37 -0400 |
commit | 93d74463d018ddf05c169ad399e62e90e0f82fc0 (patch) | |
tree | 887f61c90a9aab75060a3adbc20bcb8debd98e20 /arch/arm/mach-pxa/mainstone.c | |
parent | c463be3520065ef8c05e3cbdf946c69604e91ceb (diff) | |
parent | 4c91363dc01310dc34f1621ef00d680b4404f71c (diff) |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
* master.kernel.org:/home/rmk/linux-2.6-arm: (26 commits)
[ARM] 4856/1: Orion: initialise the sixth PCIe MBUS mapping window as well
[ARM] 4855/1: Orion: use correct ethernet unit address range
[ARM] 4853/1: include uImage target in make help
[ARM] 4851/1: ns9xxx: fix size of gpiores
[ARM] AT91: correct at91sam9263ek LCD power gpio pin
[ARM] replace remaining __FUNCTION__ occurrences
[ARM] 4850/1: include generic pgtable.h for !CONFIG_MMU case
[ARM] 4849/1: move ATAGS asm definitions
[ARM] 4848/1: at91: remove false lockdep warnings
[ARM] 4847/1: kprobes: fix compilation with CONFIG_DEBUG_FS=y
[ARM] include/asm-arm - use angle brackets for includes
[ARM] 4845/1: Orion: Ignore memory tags with invalid data
ARM: OMAP2: Register the L4 io bus to boot OMAP2
ARM: OMAP1: Compile in other 16xx boards to OSK defconfig
ARM: OMAP1: Refresh H2 defconfig
ARM: OMAP1: Refresh OSK defconfig
ARM: OMAP: gpio lockdep updates
ARM: OMAP1: omap1/pm.c build fix
ARM: OMAP1: omap h2 regression fix
ARM: OMAP1: Fix compile for boards depending on old gpio expander
...
Diffstat (limited to 'arch/arm/mach-pxa/mainstone.c')
-rw-r--r-- | arch/arm/mach-pxa/mainstone.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-pxa/mainstone.c b/arch/arm/mach-pxa/mainstone.c index 345c3deeb02e..72a436fb9a29 100644 --- a/arch/arm/mach-pxa/mainstone.c +++ b/arch/arm/mach-pxa/mainstone.c | |||
@@ -390,11 +390,11 @@ static void mainstone_mci_setpower(struct device *dev, unsigned int vdd) | |||
390 | struct pxamci_platform_data* p_d = dev->platform_data; | 390 | struct pxamci_platform_data* p_d = dev->platform_data; |
391 | 391 | ||
392 | if (( 1 << vdd) & p_d->ocr_mask) { | 392 | if (( 1 << vdd) & p_d->ocr_mask) { |
393 | printk(KERN_DEBUG "%s: on\n", __FUNCTION__); | 393 | printk(KERN_DEBUG "%s: on\n", __func__); |
394 | MST_MSCWR1 |= MST_MSCWR1_MMC_ON; | 394 | MST_MSCWR1 |= MST_MSCWR1_MMC_ON; |
395 | MST_MSCWR1 &= ~MST_MSCWR1_MS_SEL; | 395 | MST_MSCWR1 &= ~MST_MSCWR1_MS_SEL; |
396 | } else { | 396 | } else { |
397 | printk(KERN_DEBUG "%s: off\n", __FUNCTION__); | 397 | printk(KERN_DEBUG "%s: off\n", __func__); |
398 | MST_MSCWR1 &= ~MST_MSCWR1_MMC_ON; | 398 | MST_MSCWR1 &= ~MST_MSCWR1_MMC_ON; |
399 | } | 399 | } |
400 | } | 400 | } |