From: Adrian Bunk <bunk@stusta.de>
To: Andrew Morton <akpm@osdl.org>, jgarzik@pobox.com
Cc: linux-kernel@vger.kernel.org, netdev@vger.kernel.org
Subject: [-mm patch] drivers/net/phy/phy_device.c: fix compilation
Date: Sun, 7 Aug 2005 18:03:04 +0200 [thread overview]
Message-ID: <20050807160304.GD3513@stusta.de> (raw)
In-Reply-To: <20050807014214.45968af3.akpm@osdl.org>
On Sun, Aug 07, 2005 at 01:42:14AM -0700, Andrew Morton wrote:
>...
> Changes since 2.6.13-rc4-mm1:
>...
> git-netdev-upstream.patch
>...
> Subsystem trees
>...
gcc 4.0 correctly rejects this code:
<-- snip -->
...
CC drivers/net/phy/phy_device.o
drivers/net/phy/phy_device.c:659: error: static declaration of 'genphy_driver' follows non-static declaration
include/linux/phy.h:377: error: previous declaration of 'genphy_driver' was here
make[3]: *** [drivers/net/phy/phy_device.o] Error 1
<-- snip -->
Signed-off-by: Adrian Bunk <bunk@stusta.de>
--- linux-2.6.13-rc5-mm1-full/include/linux/phy.h.old 2005-08-07 15:34:01.000000000 +0200
+++ linux-2.6.13-rc5-mm1-full/include/linux/phy.h 2005-08-07 15:34:08.000000000 +0200
@@ -374,5 +374,4 @@
void phy_print_status(struct phy_device *phydev);
extern struct bus_type mdio_bus_type;
-extern struct phy_driver genphy_driver;
#endif /* __PHY_H */
--- linux-2.6.13-rc5-mm1-full/drivers/net/phy/phy_device.c.old 2005-08-07 15:34:15.000000000 +0200
+++ linux-2.6.13-rc5-mm1-full/drivers/net/phy/phy_device.c 2005-08-07 15:39:34.000000000 +0200
@@ -39,6 +39,8 @@
#include <asm/irq.h>
#include <asm/uaccess.h>
+static struct phy_driver genphy_driver;
+
/* get_phy_device
*
* description: Reads the ID registers of the PHY at addr on the
next prev parent reply other threads:[~2005-08-07 16:03 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-08-07 8:42 2.6.13-rc5-mm1 Andrew Morton
2005-08-07 13:36 ` [PATCH] mips: moreover remove vr4181 Yoichi Yuasa
2005-08-07 15:43 ` [-mm patch] more vr4181 removal Adrian Bunk
2005-08-07 16:03 ` Adrian Bunk [this message]
2005-08-07 18:51 ` 2.6.13-rc5-mm1 Avuton Olrich
2005-08-07 19:43 ` [-mm patch] fix PHYCONTROL=n compilation Adrian Bunk
2005-08-07 23:13 ` [2.6 patch] drivers/net/sk98lin/: possible cleanups Adrian Bunk
2005-08-08 0:45 ` 2.6.13-rc5-mm1 Rogério Brito
2005-08-08 0:52 ` 2.6.13-rc5-mm1 Andrew Morton
2005-08-08 10:00 ` 2.6.13-rc5-mm1 Ingo Molnar
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=20050807160304.GD3513@stusta.de \
--to=bunk@stusta.de \
--cc=akpm@osdl.org \
--cc=jgarzik@pobox.com \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.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
Powered by JetHome