Message ID | 1388112192-4762-1-git-send-email-swarren@wwwdotorg.org (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
On Thu, Dec 26, 2013 at 07:43:09PM -0700, Stephen Warren wrote: > From: Stefan Weil <sw@weilnetz.de> > > Replace "is use" by "is used" and remove a comma. > > Signed-off-by: Stefan Weil <sw@weilnetz.de> > Signed-off-by: Stephen Warren <swarren@wwwdotorg.org> > --- > Since I only have 3 patches for bcm2835 this kernel cycle, and they'll > likely go into different branches, I'm just re-sending them for direct > application. These patches are already in linux-next, but since there > are no linux-next being built at the moment, I've reset bcm2835's > for-next to remove them, so there will be no conflict. > > I imagine this would go into a "soc" branch in arm-soc. Applied 1-3 (in next/fixes-non-critical, next/dt and next/boards respectively) -Olof
diff --git a/arch/arm/mach-bcm2835/Kconfig b/arch/arm/mach-bcm2835/Kconfig index 560045ca..d1f9612 100644 --- a/arch/arm/mach-bcm2835/Kconfig +++ b/arch/arm/mach-bcm2835/Kconfig @@ -12,4 +12,4 @@ config ARCH_BCM2835 select PINCTRL_BCM2835 help This enables support for the Broadcom BCM2835 SoC. This SoC is - use in the Raspberry Pi, and Roku 2 devices. + used in the Raspberry Pi and Roku 2 devices.