Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next

[linux-2.6-block.git] / drivers / net / ethernet / sun / niu.c

diff --git a/drivers/net/ethernet/sun/niu.c b/drivers/net/ethernet/sun/niu.c
index 269c08bf399b6a1e3829f91ec6fa0c6da17e6e35..f28460ce24a7134a371dd148887cc5466e934f8b 100644 (file)
--- a/drivers/net/ethernet/sun/niu.c
+++ b/drivers/net/ethernet/sun/niu.c
@@ -9478,7 +9478,7 @@ static struct niu_parent *niu_new_parent(struct niu *np,
        if (IS_ERR(plat_dev))
                return NULL;
 
-       for (i = 0; attr_name(niu_parent_attributes[i]); i++) {
+       for (i = 0; niu_parent_attributes[i].attr.name; i++) {
                int err = device_create_file(&plat_dev->dev,
                                             &niu_parent_attributes[i]);
                if (err)