[target] generic: ESFQ patch, only include net/netfilter/nf_conntrack.h when CONFIG_N...

[openwrt.git] / target / linux / brcm63xx / files / drivers / net / bcm63xx_enet.c

diff --git a/target/linux/brcm63xx/files/drivers/net/bcm63xx_enet.c b/target/linux/brcm63xx/files/drivers/net/bcm63xx_enet.c
index 27d03eb..d338bbc 100644 (file)
--- a/target/linux/brcm63xx/files/drivers/net/bcm63xx_enet.c
+++ b/target/linux/brcm63xx/files/drivers/net/bcm63xx_enet.c
@@ -1718,7 +1718,7 @@ static int __devinit bcm_enet_probe(struct platform_device *pdev)
        if (priv->has_phy) {
                bus = &priv->mii_bus;
                bus->name = "bcm63xx_enet MII bus";
        if (priv->has_phy) {
                bus = &priv->mii_bus;
                bus->name = "bcm63xx_enet MII bus";

-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30)
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,28)

                bus->dev = &pdev->dev;
 #else
                bus->parent = &pdev->dev;
                bus->dev = &pdev->dev;
 #else
                bus->parent = &pdev->dev;