Merge branch 'r6040' of git://git.kernel.org/pub/scm/linux/kernel/git/romieu/netdev...

[linux-2.6-omap-h63xx.git] / drivers / net / atl1 / atl1_hw.c

diff --git a/drivers/net/atl1/atl1_hw.c b/drivers/net/atl1/atl1_hw.c
index ef886bdeac13d5ed689c61bc6da41e8209051704..9d3bd22e3a82f96f289a462b60a9503954cb49a8 100644 (file)
--- a/drivers/net/atl1/atl1_hw.c
+++ b/drivers/net/atl1/atl1_hw.c
@@ -603,7 +603,7 @@ static struct atl1_spi_flash_dev flash_table[] = {
 
 static void atl1_init_flash_opcode(struct atl1_hw *hw)
 {
-       if (hw->flash_vendor >= sizeof(flash_table) / sizeof(flash_table[0]))
+       if (hw->flash_vendor >= ARRAY_SIZE(flash_table))
                hw->flash_vendor = 0;   /* ATMEL */
 
        /* Init OP table */