diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-11 23:12:57 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-11 23:12:57 -0400 |
| commit | af3b146d26550f0c8e0d77b2117c6f8aec5d8146 (patch) | |
| tree | e8078b0d760cd2a2488d3755b7dee341f3ea61b3 /arch/ppc/platforms/prep_setup.c | |
| parent | c5b7bede71853d92fc747cdc12fa5234b6045731 (diff) | |
| parent | fd4ba7e2b7ce9a48b8c60d5fcd65feda5746812e (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
* 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: (23 commits)
[POWERPC] Add arch/powerpc support for the Motorola PrPMC2800
[POWERPC] Add bootwrapper support for Motorola PrPMC2800 platform
[POWERPC] Add DTS file for the Motorola PrPMC2800 platform
[POWERPC] Check cache coherency of kernel vs firmware
[POWERPC] Add Marvell mv64x60 PCI bridge support
[POWERPC] Create Marvell mv64x60 I2C platform_data
[POWERPC] Create Marvell mv64x60 ethernet platform_data
[POWERPC] Create Marvell mv64x60 MPSC (serial) platform_data
[POWERPC] Add interrupt support for Marvell mv64x60 chips
[POWERPC] Add bootwrapper support for Marvell/mv64x60 I2C
[POWERPC] Add bootwrapper support for Marvell MPSC
[POWERPC] Add bootwrapper support for Marvell/mv64x60 hostbridge
[POWERPC] Add Makefile rules to wrap dts file in zImage
[POWERPC] Spelling fixes: arch/ppc/
[POWERPC] U-boot passes the initrd as start/end, not start/size.
[POWERPC] PS3: Update ps3_defconfig
[POWERPC] PS3: Fix request_irq warning
[POWERPC] Don't complain if size-cells == 0 in prom_parse()
[POWERPC] Simplify smp_space_timers
[POWERPC] Trivial ps3 warning fixes
...
Diffstat (limited to 'arch/ppc/platforms/prep_setup.c')
| -rw-r--r-- | arch/ppc/platforms/prep_setup.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/ppc/platforms/prep_setup.c b/arch/ppc/platforms/prep_setup.c index f166299571d6..6f21110a9747 100644 --- a/arch/ppc/platforms/prep_setup.c +++ b/arch/ppc/platforms/prep_setup.c | |||
| @@ -593,7 +593,7 @@ static void __init prep_init_sound(void) | |||
| 593 | PPC_DEVICE *audiodevice = NULL; | 593 | PPC_DEVICE *audiodevice = NULL; |
| 594 | 594 | ||
| 595 | /* | 595 | /* |
| 596 | * Get the needed resource informations from residual data. | 596 | * Get the needed resource information from residual data. |
| 597 | * | 597 | * |
| 598 | */ | 598 | */ |
| 599 | if (have_residual_data) | 599 | if (have_residual_data) |
| @@ -632,9 +632,9 @@ static void __init prep_init_sound(void) | |||
| 632 | } | 632 | } |
| 633 | 633 | ||
| 634 | /* | 634 | /* |
| 635 | * Find a way to push these informations to the cs4232 driver | 635 | * Find a way to push this information to the cs4232 driver |
| 636 | * Give it out with printk, when not in cmd_line? | 636 | * Give it out with printk, when not in cmd_line? |
| 637 | * Append it to cmd_line and boot_command_line? | 637 | * Append it to cmd_line and boot_command_line? |
| 638 | * Format is cs4232=io,irq,dma,dma2 | 638 | * Format is cs4232=io,irq,dma,dma2 |
| 639 | */ | 639 | */ |
| 640 | } | 640 | } |