Re: please pull the powerpc-merge.git tree
From: David Woodhouse <dwmw2@infradead.org>
Date: 2005-11-02 07:35:12
Subsystem:
char and misc drivers, linux for powerpc (32-bit and 64-bit), telecom clock driver for mcpl0010, the rest · Maintainers:
Arnd Bergmann, Greg Kroah-Hartman, Madhavan Srinivasan, Michael Ellerman, Mark Gross, Linus Torvalds
On Wed, 2005-11-02 at 15:43 +1100, Paul Mackerras wrote:
I also pulled in Linus' tree, and now drivers/char/tlclk.c fails to build for some reason. I claim that's not my fault, however. :)
It just needs <linux/platform_device.h> included. That reminds me -- I needed that in platforms/chrp/pegasos_eth.c too.
diff --git a/arch/powerpc/platforms/chrp/pegasos_eth.c b/arch/powerpc/platforms/chrp/pegasos_eth.c
--- a/arch/powerpc/platforms/chrp/pegasos_eth.c
+++ b/arch/powerpc/platforms/chrp/pegasos_eth.c@@ -15,6 +15,7 @@ #include <linux/ioport.h> #include <linux/device.h> #include <linux/mv643xx.h> +#include <linux/platform_device.h> #include <linux/pci.h> #define PEGASOS2_MARVELL_REGBASE (0xf1000000)
diff --git a/drivers/char/tlclk.c b/drivers/char/tlclk.c
--- a/drivers/char/tlclk.c
+++ b/drivers/char/tlclk.c@@ -43,6 +43,7 @@ #include <linux/sysfs.h> #include <linux/device.h> #include <linux/miscdevice.h> +#include <linux/platform_device.h> #include <asm/io.h> /* inb/outb */ #include <asm/uaccess.h>
--
dwmw2