Skip to contentSkip to conversation

Fix build breakage in ep93xx-core

PATCH New Ryan Mallon 2 participants 3 messages Apr 11, 2012

Subsystems (3)
Arm (32-bit) Arm sub-architectures Arm/Cirrus logic EP93XX Arm architecture
lore
Share & tools
lore

Ryan Mallon

author
#0 lore raw

PATCH 1/1 Fix build breakage in ep93xx-core

Commit ede55aaa8bb2dd37e302b2f94312306d216e5f97 "arm: ep93xx: use DEFINE_RES_* macros" introduced a build breakage in ep93xx due to a typo. Fix it.

Signed-off-by Ryan Mallon <[email protected]>
Cc Hartley Sweeten <[email protected]>

---

I should have caught this when I applied it to my tree, but its now already got a patch sitting on top of it. I'll be doing test builds for each applied patch in future :-).

arch/arm/mach-ep93xx/core.c +1 -1
index 8771076..66b1494 100644
@@ -357,7 +357,7 @@ static struct ep93xx_eth_data ep93xx_eth_data;
 
 static struct resource ep93xx_eth_resource[] = {
 	DEFINE_RES_MEM(EP93XX_ETHERNET_PHYS_BASE, 0x10000),
-	DEFINE_REQ_IRQ(IRQ_EP93XX_ETHERNET),
+	DEFINE_RES_IRQ(IRQ_EP93XX_ETHERNET),
 };
 
 static u64 ep93xx_eth_dma_mask = DMA_BIT_MASK(32);
author
#1 lore raw

PATCH 1/1 Fix build breakage in ep93xx-core

Quoted 4 lines · Ryan Mallon

Commit ede55aaa8bb2dd37e302b2f94312306d216e5f97 "arm: ep93xx: use DEFINE_RES_* macros" introduced a build breakage in ep93xx due to a typo. Fix it.

Quoted 8 lines
Signed-off-by Ryan Mallon <[email protected]>
Cc Hartley Sweeten <[email protected]>

---

I should have caught this when I applied it to my tree, but its now already got a patch sitting on top of it. I'll be doing test builds for each applied patch in future :-).

Actually, I haven't pushed yet so I can still fold this into the original patch so we don't break bisection, etc.

~Ryan

Quoted 14 lines
arch/arm/mach-ep93xx/core.c +1 -1
index 8771076..66b1494 100644
@@ -357,7 +357,7 @@ static struct ep93xx_eth_data ep93xx_eth_data;
 
 static struct resource ep93xx_eth_resource[] = {
 	DEFINE_RES_MEM(EP93XX_ETHERNET_PHYS_BASE, 0x10000),
-	DEFINE_REQ_IRQ(IRQ_EP93XX_ETHERNET),
+	DEFINE_RES_IRQ(IRQ_EP93XX_ETHERNET),
 };
 
 static u64 ep93xx_eth_dma_mask = DMA_BIT_MASK(32);
#2 lore raw

PATCH 1/1 Fix build breakage in ep93xx-core

In reply to Ryan Mallon
Quoted 6 lines · Ryan Mallon

Commit ede55aaa8bb2dd37e302b2f94312306d216e5f97 "arm: ep93xx: use DEFINE_RES_* macros" introduced a build breakage in ep93xx due to a typo. Fix it.

Signed-off-by Ryan Mallon <[email protected]>
Cc Hartley Sweeten <[email protected]>

Doh! It's correct in my tree but somehow I fubared it when I created the patch. Sorry for the trouble.

Acked-by H Hartley Sweeten <[email protected]>
Quoted 19 lines

---

I should have caught this when I applied it to my tree, but its now already got a patch sitting on top of it. I'll be doing test builds for each applied patch in future :-).

arch/arm/mach-ep93xx/core.c +1 -1
index 8771076..66b1494 100644
@@ -357,7 +357,7 @@ static struct ep93xx_eth_data ep93xx_eth_data;
 
 static struct resource ep93xx_eth_resource[] = {
 	DEFINE_RES_MEM(EP93XX_ETHERNET_PHYS_BASE, 0x10000),
-	DEFINE_REQ_IRQ(IRQ_EP93XX_ETHERNET),
+	DEFINE_RES_IRQ(IRQ_EP93XX_ETHERNET),
 };
 
 static u64 ep93xx_eth_dma_mask = DMA_BIT_MASK(32);