Skip to contentSkip to conversation

ARM: Make raumfeld.c compile

PATCH New Daniel Mack 2 participants 3 messages Jan 13, 2010

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ARM: Make raumfeld.c compile

---
Eric, as the original patch isn't merged yet, you can also squash this one if you like, whatever works better for you.

 arch/arm/mach-pxa/raumfeld.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)
arch/arm/mach-pxa/raumfeld.c +2 -1
index 9aff746..90302f8 100644
@@ -52,10 +52,11 @@
 #include <mach/pxa3xx-regs.h>
 #include <mach/mfp-pxa3xx.h>
 #include <mach/mfp-pxa300.h>
-#include <mach/pxa3xx_nand.h>
 #include <mach/ohci.h>
 #include <mach/pxafb.h>
 #include <mach/mmc.h>
+
+#include <plat/pxa3xx_nand.h>
 #include <plat/i2c.h>
 
 #include "generic.h"
Signature · 1 line
1.6.5.2
#1 lore raw

PATCH 1/1 ARM: Make raumfeld.c compile

Quoted 6 lines · Daniel Mack

---
Eric, as the original patch isn't merged yet, you can also squash this one if you like, whatever works better for you.

I've already corrected that one. Are you able to give a quick test of my 'devel' branch, it's there except not pulled.

#2 lore raw

PATCH 1/1 ARM: Make raumfeld.c compile

Quoted 10 lines · Eric Miao
Quoted 6 lines · Daniel Mack

---
Eric, as the original patch isn't merged yet, you can also squash this one if you like, whatever works better for you.

I've already corrected that one. Are you able to give a quick test of my 'devel' branch, it's there except not pulled.

Ah, great, missed that.

Your devel branch works well for me, thanks a lot.

Daniel