Commit 6845664a6a7d443f03883db59d10749d38d98b8e, "arm: Cleanup the irq
namespace" introduces a typo causing a build failure for the versatile
platform.
Signed-off-by: Grant Likely <[email protected]>
---
arch/arm/mach-versatile/core.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/arch/arm/mach-versatile/core.c b/arch/arm/mach-versatile/core.c
index 96e59e3..eb7ffa0 100644
--- a/arch/arm/mach-versatile/core.c
+++ b/arch/arm/mach-versatile/core.c
@@ -314,7 +314,7 @@ static struct mmci_platform_data mmc0_plat_data = {
.gpio_cd = -1,
};
-static struct resource chalcd_resources[] = {
+static struct resource char_lcd_resources[] = {
{
.start = VERSATILE_CHAR_LCD_BASE,
.end = (VERSATILE_CHAR_LCD_BASE + SZ_4K - 1),
On Wed, 30 Mar 2011, Grant Likely wrote:
> Commit 6845664a6a7d443f03883db59d10749d38d98b8e, "arm: Cleanup the irq
> namespace" introduces a typo causing a build failure for the versatile
> platform.
Sorry about that. I have no clue how I fatfingered that in last
minute.
rmk: are you picking it up or should I push it linuswards with the
other fixups ?
Thanks,
tglx
On Wed, Mar 30, 2011 at 11:08:07AM +0200, Thomas Gleixner wrote:
> On Wed, 30 Mar 2011, Grant Likely wrote:
>
> > Commit 6845664a6a7d443f03883db59d10749d38d98b8e, "arm: Cleanup the irq
> > namespace" introduces a typo causing a build failure for the versatile
> > platform.
>
> Sorry about that. I have no clue how I fatfingered that in last
> minute.
>
> rmk: are you picking it up or should I push it linuswards with the
> other fixups ?
If you have other fixes which you're already sending, you might as well
include those. Linus hasn't pulled my stuff from last night so I'm not
touching my tree today.
Commit-ID: e282326600f31ab38d8814fd6deb277a48850c35
Gitweb: http://git.kernel.org/tip/e282326600f31ab38d8814fd6deb277a48850c35
Author: Grant Likely <[email protected]>
AuthorDate: Wed, 30 Mar 2011 00:02:29 -0600
Committer: Thomas Gleixner <[email protected]>
CommitDate: Wed, 30 Mar 2011 12:02:15 +0200
arm: versatile : Fix typo introduced in irq namespace cleanup
Commit 6845664(arm: Cleanup the irq namespace) introduces a typo
causing a build failure for the versatile platform.
[ tglx: Sorry, my bad. Have no idea how I fatfingered that ]
Signed-off-by: Grant Likely <[email protected]>
Cc: Catalin Marinas <[email protected]>
Cc: Russell King <[email protected]>
Cc: [email protected]
LKML-Reference: <20110330060229.27397.7628.stgit@ponder>
Signed-off-by: Thomas Gleixner <[email protected]>
---
arch/arm/mach-versatile/core.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/arch/arm/mach-versatile/core.c b/arch/arm/mach-versatile/core.c
index 96e59e3..eb7ffa0 100644
--- a/arch/arm/mach-versatile/core.c
+++ b/arch/arm/mach-versatile/core.c
@@ -314,7 +314,7 @@ static struct mmci_platform_data mmc0_plat_data = {
.gpio_cd = -1,
};
-static struct resource chalcd_resources[] = {
+static struct resource char_lcd_resources[] = {
{
.start = VERSATILE_CHAR_LCD_BASE,
.end = (VERSATILE_CHAR_LCD_BASE + SZ_4K - 1),