diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-10-25 06:11:02 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-10-25 06:11:02 -0400 |
commit | 59e52534172d845ebffb0d7e85fc56fb7b857051 (patch) | |
tree | 49552e03f1bdb413cd8b5f7542e91770688d7047 /arch/powerpc/platforms | |
parent | 73692d9bb58ecc2fa73f4b2bfcf6eadaa6d49a26 (diff) | |
parent | 0d89e54c8249645404283436d952afc261a04e1e (diff) |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (59 commits)
MAINTAINERS: linux-m32r is moderated for non-subscribers
linux@lists.openrisc.net is moderated for non-subscribers
Drop default from "DM365 codec select" choice
parisc: Kconfig: cleanup Kernel page size default
Kconfig: remove redundant CONFIG_ prefix on two symbols
cris: remove arch/cris/arch-v32/lib/nand_init.S
microblaze: add missing CONFIG_ prefixes
h8300: drop puzzling Kconfig dependencies
MAINTAINERS: microblaze-uclinux@itee.uq.edu.au is moderated for non-subscribers
tty: drop superfluous dependency in Kconfig
ARM: mxc: fix Kconfig typo 'i.MX51'
Fix file references in Kconfig files
aic7xxx: fix Kconfig references to READMEs
Fix file references in drivers/ide/
thinkpad_acpi: Fix printk typo 'bluestooth'
bcmring: drop commented out line in Kconfig
btmrvl_sdio: fix typo 'btmrvl_sdio_sd6888'
doc: raw1394: Trivial typo fix
CIFS: Don't free volume_info->UNC until we are entirely done with it.
treewide: Correct spelling of successfully in comments
...
Diffstat (limited to 'arch/powerpc/platforms')
-rw-r--r-- | arch/powerpc/platforms/85xx/Kconfig | 2 | ||||
-rw-r--r-- | arch/powerpc/platforms/embedded6xx/storcenter.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/platforms/85xx/Kconfig b/arch/powerpc/platforms/85xx/Kconfig index 498534cd526..12f5932dadc 100644 --- a/arch/powerpc/platforms/85xx/Kconfig +++ b/arch/powerpc/platforms/85xx/Kconfig | |||
@@ -80,7 +80,7 @@ config P1010_RDB | |||
80 | config P1022_DS | 80 | config P1022_DS |
81 | bool "Freescale P1022 DS" | 81 | bool "Freescale P1022 DS" |
82 | select DEFAULT_UIMAGE | 82 | select DEFAULT_UIMAGE |
83 | select CONFIG_PHYS_64BIT # The DTS has 36-bit addresses | 83 | select PHYS_64BIT # The DTS has 36-bit addresses |
84 | select SWIOTLB | 84 | select SWIOTLB |
85 | help | 85 | help |
86 | This option enables support for the Freescale P1022DS reference board. | 86 | This option enables support for the Freescale P1022DS reference board. |
diff --git a/arch/powerpc/platforms/embedded6xx/storcenter.c b/arch/powerpc/platforms/embedded6xx/storcenter.c index 613070e9ddb..f1eebcae9bf 100644 --- a/arch/powerpc/platforms/embedded6xx/storcenter.c +++ b/arch/powerpc/platforms/embedded6xx/storcenter.c | |||
@@ -77,7 +77,7 @@ static void __init storcenter_setup_arch(void) | |||
77 | } | 77 | } |
78 | 78 | ||
79 | /* | 79 | /* |
80 | * Interrupt setup and service. Interrrupts on the turbostation come | 80 | * Interrupt setup and service. Interrupts on the turbostation come |
81 | * from the four PCI slots plus onboard 8241 devices: I2C, DUART. | 81 | * from the four PCI slots plus onboard 8241 devices: I2C, DUART. |
82 | */ | 82 | */ |
83 | static void __init storcenter_init_IRQ(void) | 83 | static void __init storcenter_init_IRQ(void) |