* [PATCH] ARM: Make raumfeld.c compile
@ 2010-01-13 12:03 Daniel Mack
2010-01-13 12:11 ` Eric Miao
0 siblings, 1 reply; 3+ messages in thread
From: Daniel Mack @ 2010-01-13 12:03 UTC (permalink / raw)
To: linux-arm-kernel
Signed-off-by: Daniel Mack <daniel@caiaq.de>
Cc: Eric Miao <eric.y.miao@gmail.com>
---
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(-)
diff --git a/arch/arm/mach-pxa/raumfeld.c b/arch/arm/mach-pxa/raumfeld.c
index 9aff746..90302f8 100644
--- a/arch/arm/mach-pxa/raumfeld.c
+++ b/arch/arm/mach-pxa/raumfeld.c
@@ -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"
--
1.6.5.2
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH] ARM: Make raumfeld.c compile
2010-01-13 12:03 [PATCH] ARM: Make raumfeld.c compile Daniel Mack
@ 2010-01-13 12:11 ` Eric Miao
2010-01-13 12:46 ` Daniel Mack
0 siblings, 1 reply; 3+ messages in thread
From: Eric Miao @ 2010-01-13 12:11 UTC (permalink / raw)
To: linux-arm-kernel
On Wed, Jan 13, 2010 at 8:03 PM, Daniel Mack <daniel@caiaq.de> wrote:
> Signed-off-by: Daniel Mack <daniel@caiaq.de>
> Cc: Eric Miao <eric.y.miao@gmail.com>
> ---
> 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.
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH] ARM: Make raumfeld.c compile
2010-01-13 12:11 ` Eric Miao
@ 2010-01-13 12:46 ` Daniel Mack
0 siblings, 0 replies; 3+ messages in thread
From: Daniel Mack @ 2010-01-13 12:46 UTC (permalink / raw)
To: linux-arm-kernel
On Wed, Jan 13, 2010 at 08:11:26PM +0800, Eric Miao wrote:
> On Wed, Jan 13, 2010 at 8:03 PM, Daniel Mack <daniel@caiaq.de> wrote:
> > Signed-off-by: Daniel Mack <daniel@caiaq.de>
> > Cc: Eric Miao <eric.y.miao@gmail.com>
> > ---
> > 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
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2010-01-13 12:46 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-01-13 12:03 [PATCH] ARM: Make raumfeld.c compile Daniel Mack
2010-01-13 12:11 ` Eric Miao
2010-01-13 12:46 ` Daniel Mack
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).