diff options
| author | Tony Breeds <tony@bakeyournoodle.com> | 2011-08-18 21:33:49 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-08-18 21:33:49 -0700 |
| commit | 3b3bceef26f8273b1f51c503e9485a35b8326417 (patch) | |
| tree | 6cf64c541343d0c50470002516f254d4ced63a85 /drivers/net/ethernet/ibm/emac/tah.h | |
| parent | e88db79b0131b2067bee2e866fd7021fc5af84be (diff) | |
net: fix IBM EMAC driver after rename.
In commit 9aa3283595451ca093500ff0977b106e1f465586 (ehea/ibm*: Move the
IBM drivers) the IBM_NEW_EMAC* were renames to IBM_EMAC*
The conversion was incomplete so that even if the driver was added to
the .config it wasn't built, but there were no errors). In this commit
we also update the various defconfigs that use EMAC to use the new
Kconfig symbol, and explicitly add the NET_VENDOR_IBM guard.
We do not explicitly select the Kconfig dependencies, as this would force
EMAC on. Doing it in the defconfig allows more flexibility.
Tested on a canyondlands board.
Signed-off-by: Tony Breeds <tony@bakeyournoodle.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/ibm/emac/tah.h')
| -rw-r--r-- | drivers/net/ethernet/ibm/emac/tah.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/ibm/emac/tah.h b/drivers/net/ethernet/ibm/emac/tah.h index 61dbeca006d1..3437ab4964c7 100644 --- a/drivers/net/ethernet/ibm/emac/tah.h +++ b/drivers/net/ethernet/ibm/emac/tah.h @@ -70,7 +70,7 @@ struct tah_instance { #define TAH_MR_DTFP 0x00100000 #define TAH_MR_DIG 0x00080000 -#ifdef CONFIG_IBM_NEW_EMAC_TAH +#ifdef CONFIG_IBM_EMAC_TAH extern int tah_init(void); extern void tah_exit(void); @@ -90,6 +90,6 @@ extern void *tah_dump_regs(struct platform_device *ofdev, void *buf); # define tah_get_regs_len(x) 0 # define tah_dump_regs(x,buf) (buf) -#endif /* !CONFIG_IBM_NEW_EMAC_TAH */ +#endif /* !CONFIG_IBM_EMAC_TAH */ #endif /* __IBM_NEWEMAC_TAH_H */ |