[PATCH -next] sh: fix up the machtypes.h move.

linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed

* [PATCH -next] sh: fix up the machtypes.h move.
@ 2009-09-28  7:33 Paul Mundt
  2009-09-28  7:49 ` Sam Ravnborg
  0 siblings, 1 reply; 2+ messages in thread
From: Paul Mundt @ 2009-09-28  7:33 UTC (permalink / raw)
  To: Sam Ravnborg; +Cc: linux-next

rts7751r2d PCI support is referencing the old asm/ version.

Signed-off-by: Paul Mundt <lethal@linux-sh.org>

---

 arch/sh/drivers/pci/fixups-rts7751r2d.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/sh/drivers/pci/fixups-rts7751r2d.c b/arch/sh/drivers/pci/fixups-rts7751r2d.c
index 052b354..7898f14 100644
--- a/arch/sh/drivers/pci/fixups-rts7751r2d.c
+++ b/arch/sh/drivers/pci/fixups-rts7751r2d.c
@@ -15,7 +15,7 @@
 #include <mach/lboxre2.h>
 #include <mach/r2d.h>
 #include "pci-sh4.h"
-#include <asm/machtypes.h>
+#include <generated/machtypes.h>
 
 #define PCIMCR_MRSET_OFF	0xBFFFFFFF
 #define PCIMCR_RFSH_OFF		0xFFFFFFFB

^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH -next] sh: fix up the machtypes.h move.
  2009-09-28  7:33 [PATCH -next] sh: fix up the machtypes.h move Paul Mundt
@ 2009-09-28  7:49 ` Sam Ravnborg
  0 siblings, 0 replies; 2+ messages in thread
From: Sam Ravnborg @ 2009-09-28  7:49 UTC (permalink / raw)
  To: Paul Mundt; +Cc: linux-next

On Mon, Sep 28, 2009 at 04:33:27PM +0900, Paul Mundt wrote:
> rts7751r2d PCI support is referencing the old asm/ version.
> 
> Signed-off-by: Paul Mundt <lethal@linux-sh.org>

Thanks.
Linus did not take this patchset before -rc1 :-(

So I think it may have to wait until next merge window in which case
I will submit the sh specific bits to you with this patch included.

	Sam

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2009-09-28  7:49 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-09-28  7:33 [PATCH -next] sh: fix up the machtypes.h move Paul Mundt
2009-09-28  7:49 ` Sam Ravnborg

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).