diff --git a/[refs] b/[refs] index 0da1b16e23d8..43d34103e038 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f42157cb568c1eb02eca7df4da67553a9edae24a +refs/heads/master: 08013fa353fdcfc0a03cae805393abfc56722387 diff --git a/trunk/drivers/net/bnx2.c b/trunk/drivers/net/bnx2.c index d4548101e495..2486a656f12d 100644 --- a/trunk/drivers/net/bnx2.c +++ b/trunk/drivers/net/bnx2.c @@ -35,8 +35,8 @@ #include #include #include -#if defined(CONFIG_VLAN_8021Q) || defined(CONFIG_VLAN_8021Q_MODULE) #include +#if defined(CONFIG_VLAN_8021Q) || defined(CONFIG_VLAN_8021Q_MODULE) #define BCM_VLAN 1 #endif #include