[-mm patch] drivers/net/phy/phy_device.c: fix compilation

[Adrian Bunk <bunk@stusta.de>]

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

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/