Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

[pandora-kernel.git] / include / linux / davinci_emac.h

diff --git a/include/linux/davinci_emac.h b/include/linux/davinci_emac.h
index ff55487..7c930db 100644 (file)
--- a/include/linux/davinci_emac.h
+++ b/include/linux/davinci_emac.h
@@ -19,12 +19,15 @@ struct emac_platform_data {
        u32 ctrl_reg_offset;
        u32 ctrl_mod_reg_offset;
        u32 ctrl_ram_offset;
+       u32 hw_ram_addr;
        u32 mdio_reg_offset;
        u32 ctrl_ram_size;
        u32 phy_mask;
        u32 mdio_max_freq;
        u8 rmii_en;
        u8 version;
+       void (*interrupt_enable) (void);
+       void (*interrupt_disable) (void);
 };
 
 enum {