[PATCH -queue] Alchemy: fix pb1100/pb1500 compile failures

[PATCH -queue] Alchemy: fix pb1100/pb1500 compile failures

[Manuel Lauss]

forgot to remove inclusion of removed headers and add required ones.

Signed-off-by: Manuel Lauss <manuel.lauss@gmail.com>
---
Extends  "MIPS: Alchemy: devboards: wire up new PCMCIA driver" in
Ralf's linux-queue tree.

Please apply or fold into the above mentioned patch!
Thanks!

 arch/mips/alchemy/devboards/pb1100/board_setup.c |    1 -
 arch/mips/alchemy/devboards/pb1100/platform.c    |    2 ++
 arch/mips/alchemy/devboards/pb1500/board_setup.c |    1 -
 arch/mips/alchemy/devboards/pb1500/platform.c    |    1 +
 4 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/arch/mips/alchemy/devboards/pb1100/board_setup.c b/arch/mips/alchemy/devboards/pb1100/board_setup.c
index aad424a..b282d93 100644
--- a/arch/mips/alchemy/devboards/pb1100/board_setup.c
+++ b/arch/mips/alchemy/devboards/pb1100/board_setup.c
@@ -29,7 +29,6 @@
 #include <linux/interrupt.h>
 
 #include <asm/mach-au1x00/au1000.h>
-#include <asm/mach-pb1x00/pb1100.h>
 #include <asm/mach-db1x00/bcsr.h>
 
 #include <prom.h>
diff --git a/arch/mips/alchemy/devboards/pb1100/platform.c b/arch/mips/alchemy/devboards/pb1100/platform.c
index 8aefecd..8487da5 100644
--- a/arch/mips/alchemy/devboards/pb1100/platform.c
+++ b/arch/mips/alchemy/devboards/pb1100/platform.c
@@ -20,6 +20,8 @@
 
 #include <linux/init.h>
 
+#include <asm/mach-au1x00/au1000.h>
+
 #include "../platform.h"
 
 static int __init pb1100_dev_init(void)
diff --git a/arch/mips/alchemy/devboards/pb1500/board_setup.c b/arch/mips/alchemy/devboards/pb1500/board_setup.c
index 4c4facb..a148802 100644
--- a/arch/mips/alchemy/devboards/pb1500/board_setup.c
+++ b/arch/mips/alchemy/devboards/pb1500/board_setup.c
@@ -29,7 +29,6 @@
 #include <linux/interrupt.h>
 
 #include <asm/mach-au1x00/au1000.h>
-#include <asm/mach-pb1x00/pb1500.h>
 #include <asm/mach-db1x00/bcsr.h>
 
 #include <prom.h>
diff --git a/arch/mips/alchemy/devboards/pb1500/platform.c b/arch/mips/alchemy/devboards/pb1500/platform.c
index beb21e4..6c00cbe 100644
--- a/arch/mips/alchemy/devboards/pb1500/platform.c
+++ b/arch/mips/alchemy/devboards/pb1500/platform.c
@@ -19,6 +19,7 @@
  */
 
 #include <linux/init.h>
+#include <asm/mach-au1x00/au1000.h>
 
 #include "../platform.h"
 
-- 
1.6.5.rc2

Re: [PATCH -queue] Alchemy: fix pb1100/pb1500 compile failures

[Ralf Baechle]

On Wed, Oct 07, 2009 at 05:31:17PM +0200, Manuel Lauss wrote:

> forgot to remove inclusion of removed headers and add required ones.
> 
> Signed-off-by: Manuel Lauss <manuel.lauss@gmail.com>
> ---
> Extends  "MIPS: Alchemy: devboards: wire up new PCMCIA driver" in
> Ralf's linux-queue tree.
> 
> Please apply or fold into the above mentioned patch!
> Thanks!

Done.