2 files changed, 4 insertions, 4 deletions

diff --git a/drivers/net/ethernet/8390/Kconfig b/drivers/net/ethernet/8390/Kconfig
index a5f91e1e8fe3..becef25fa194 100644
--- a/drivers/net/ethernet/8390/Kconfig
+++ b/drivers/net/ethernet/8390/Kconfig
@@ -148,7 +148,7 @@ config PCMCIA_PCNET
 
 config NE_H8300
         tristate "NE2000 compatible support for H8/300"
-        depends on H8300
+        depends on H8300H_AKI3068NET || H8300H_H8MAX
         ---help---
           Say Y here if you want to use the NE2000 compatible
           controller on the Renesas H8/300 processor.
diff --git a/drivers/net/ethernet/8390/ax88796.c b/drivers/net/ethernet/8390/ax88796.c
index e1d26433d619..f92f001551da 100644
--- a/drivers/net/ethernet/8390/ax88796.c
+++ b/drivers/net/ethernet/8390/ax88796.c
@@ -707,7 +707,7 @@ static int ax_init_dev(struct net_device *dev)
 
 #ifdef CONFIG_AX88796_93CX6
         if (ax->plat->flags & AXFLG_HAS_93CX6) {
-                unsigned char mac_addr[6];
+                unsigned char mac_addr[ETH_ALEN];
                 struct eeprom_93cx6 eeprom;
 
                 eeprom.data = ei_local;
@@ -719,7 +719,7 @@ static int ax_init_dev(struct net_device *dev)
                                        (__le16 __force *)mac_addr,
                                        sizeof(mac_addr) >> 1);
 
-                memcpy(dev->dev_addr, mac_addr, 6);
+                memcpy(dev->dev_addr, mac_addr, ETH_ALEN);
         }
 #endif
         if (ax->plat->wordlength == 2) {
@@ -840,7 +840,7 @@ static int ax_probe(struct platform_device *pdev)
         ei_local = netdev_priv(dev);
         ax = to_ax_dev(dev);
 
-        ax->plat = pdev->dev.platform_data;
+        ax->plat = dev_get_platdata(&pdev->dev);
         platform_set_drvdata(pdev, dev);
 
         ei_local->rxcr_base = ax->plat->rcr_val;