LinuxPPC-Dev Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: David Woodhouse <dwmw2@infradead.org>
To: Paul Mackerras <paulus@samba.org>
Cc: linuxppc-dev@ozlabs.org, linuxppc64-dev@ozlabs.org
Subject: Re: please pull the powerpc-merge.git tree
Date: Wed, 02 Nov 2005 07:35:12 +0000	[thread overview]
Message-ID: <1130916912.10031.143.camel@baythorne.infradead.org> (raw)
In-Reply-To: <17256.17408.247708.622755@cargo.ozlabs.ibm.com>

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

  reply	other threads:[~2005-11-02  7:35 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2005-10-31  4:23 please pull the powerpc-merge.git tree Paul Mackerras
2005-11-01 15:54 ` David Woodhouse
2005-11-02  0:06   ` David Gibson
2005-11-02  1:03   ` Paul Mackerras
2005-11-02  9:06     ` David Woodhouse
2005-11-02  1:04   ` Paul Mackerras
2005-11-01 16:06 ` David Woodhouse
2005-11-02  4:43   ` Paul Mackerras
2005-11-02  7:35     ` David Woodhouse [this message]
2005-11-02 16:54     ` David Woodhouse

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1130916912.10031.143.camel@baythorne.infradead.org \
    --to=dwmw2@infradead.org \
    --cc=linuxppc-dev@ozlabs.org \
    --cc=linuxppc64-dev@ozlabs.org \
    --cc=paulus@samba.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox