Commit c359ca88 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch '20130924_dn_externs_2' of git://repo.or.cz/linux-2.6/trivial-mods 



Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 8ce44061 294da3ab

drivers/net/ethernet/ibm/emac/debug.h

+7 −7
Original line number Diff line number Diff line
@@ -29,13 +29,13 @@ 
struct emac_instance;

struct mal_instance;



extern void emac_dbg_register(struct emac_instance *dev);

extern void emac_dbg_unregister(struct emac_instance *dev);

extern void mal_dbg_register(struct mal_instance *mal);

extern void mal_dbg_unregister(struct mal_instance *mal);

extern int emac_init_debug(void) __init;

extern void emac_fini_debug(void) __exit;

extern void emac_dbg_dump_all(void);

void emac_dbg_register(struct emac_instance *dev);

void emac_dbg_unregister(struct emac_instance *dev);

void mal_dbg_register(struct mal_instance *mal);

void mal_dbg_unregister(struct mal_instance *mal);

int emac_init_debug(void) __init;

void emac_fini_debug(void) __exit;

void emac_dbg_dump_all(void);



# define DBG_LEVEL		1

drivers/net/ethernet/ibm/emac/rgmii.h

+9 −9
Original line number Diff line number Diff line
@@ -56,15 +56,15 @@ struct rgmii_instance { 


#ifdef CONFIG_IBM_EMAC_RGMII



extern int rgmii_init(void);

extern void rgmii_exit(void);

extern int rgmii_attach(struct platform_device *ofdev, int input, int mode);

extern void rgmii_detach(struct platform_device *ofdev, int input);

extern void rgmii_get_mdio(struct platform_device *ofdev, int input);

extern void rgmii_put_mdio(struct platform_device *ofdev, int input);

extern void rgmii_set_speed(struct platform_device *ofdev, int input, int speed);

extern int rgmii_get_regs_len(struct platform_device *ofdev);

extern void *rgmii_dump_regs(struct platform_device *ofdev, void *buf);

int rgmii_init(void);

void rgmii_exit(void);

int rgmii_attach(struct platform_device *ofdev, int input, int mode);

void rgmii_detach(struct platform_device *ofdev, int input);

void rgmii_get_mdio(struct platform_device *ofdev, int input);

void rgmii_put_mdio(struct platform_device *ofdev, int input);

void rgmii_set_speed(struct platform_device *ofdev, int input, int speed);

int rgmii_get_regs_len(struct platform_device *ofdev);

void *rgmii_dump_regs(struct platform_device *ofdev, void *buf);



#else

drivers/net/ethernet/ibm/emac/tah.h

+7 −7
Original line number Diff line number Diff line
@@ -72,13 +72,13 @@ struct tah_instance { 


#ifdef CONFIG_IBM_EMAC_TAH



extern int tah_init(void);

extern void tah_exit(void);

extern int tah_attach(struct platform_device *ofdev, int channel);

extern void tah_detach(struct platform_device *ofdev, int channel);

extern void tah_reset(struct platform_device *ofdev);

extern int tah_get_regs_len(struct platform_device *ofdev);

extern void *tah_dump_regs(struct platform_device *ofdev, void *buf);

int tah_init(void);

void tah_exit(void);

int tah_attach(struct platform_device *ofdev, int channel);

void tah_detach(struct platform_device *ofdev, int channel);

void tah_reset(struct platform_device *ofdev);

int tah_get_regs_len(struct platform_device *ofdev);

void *tah_dump_regs(struct platform_device *ofdev, void *buf);



#else

drivers/net/ethernet/ibm/emac/zmii.h

+9 −9
Original line number Diff line number Diff line
@@ -53,15 +53,15 @@ struct zmii_instance { 


#ifdef CONFIG_IBM_EMAC_ZMII



extern int zmii_init(void);

extern void zmii_exit(void);

extern int zmii_attach(struct platform_device *ofdev, int input, int *mode);

extern void zmii_detach(struct platform_device *ofdev, int input);

extern void zmii_get_mdio(struct platform_device *ofdev, int input);

extern void zmii_put_mdio(struct platform_device *ofdev, int input);

extern void zmii_set_speed(struct platform_device *ofdev, int input, int speed);

extern int zmii_get_regs_len(struct platform_device *ocpdev);

extern void *zmii_dump_regs(struct platform_device *ofdev, void *buf);

int zmii_init(void);

void zmii_exit(void);

int zmii_attach(struct platform_device *ofdev, int input, int *mode);

void zmii_detach(struct platform_device *ofdev, int input);

void zmii_get_mdio(struct platform_device *ofdev, int input);

void zmii_put_mdio(struct platform_device *ofdev, int input);

void zmii_set_speed(struct platform_device *ofdev, int input, int speed);

int zmii_get_regs_len(struct platform_device *ocpdev);

void *zmii_dump_regs(struct platform_device *ofdev, void *buf);



#else

# define zmii_init()		0

drivers/net/ethernet/intel/e1000/e1000.h

+16 −16
Original line number Diff line number Diff line
@@ -325,7 +325,7 @@ enum e1000_state_t { 
#undef pr_fmt

#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt



extern struct net_device *e1000_get_hw_dev(struct e1000_hw *hw);

struct net_device *e1000_get_hw_dev(struct e1000_hw *hw);

#define e_dbg(format, arg...) \

	netdev_dbg(e1000_get_hw_dev(hw), format, ## arg)

#define e_err(msglvl, format, arg...) \
@@ -346,20 +346,20 @@ extern struct net_device *e1000_get_hw_dev(struct e1000_hw *hw); 
extern char e1000_driver_name[];

extern const char e1000_driver_version[];



extern int e1000_up(struct e1000_adapter *adapter);

extern void e1000_down(struct e1000_adapter *adapter);

extern void e1000_reinit_locked(struct e1000_adapter *adapter);

extern void e1000_reset(struct e1000_adapter *adapter);

extern int e1000_set_spd_dplx(struct e1000_adapter *adapter, u32 spd, u8 dplx);

extern int e1000_setup_all_rx_resources(struct e1000_adapter *adapter);

extern int e1000_setup_all_tx_resources(struct e1000_adapter *adapter);

extern void e1000_free_all_rx_resources(struct e1000_adapter *adapter);

extern void e1000_free_all_tx_resources(struct e1000_adapter *adapter);

extern void e1000_update_stats(struct e1000_adapter *adapter);

extern bool e1000_has_link(struct e1000_adapter *adapter);

extern void e1000_power_up_phy(struct e1000_adapter *);

extern void e1000_set_ethtool_ops(struct net_device *netdev);

extern void e1000_check_options(struct e1000_adapter *adapter);

extern char *e1000_get_hw_dev_name(struct e1000_hw *hw);

int e1000_up(struct e1000_adapter *adapter);

void e1000_down(struct e1000_adapter *adapter);

void e1000_reinit_locked(struct e1000_adapter *adapter);

void e1000_reset(struct e1000_adapter *adapter);

int e1000_set_spd_dplx(struct e1000_adapter *adapter, u32 spd, u8 dplx);

int e1000_setup_all_rx_resources(struct e1000_adapter *adapter);

int e1000_setup_all_tx_resources(struct e1000_adapter *adapter);

void e1000_free_all_rx_resources(struct e1000_adapter *adapter);

void e1000_free_all_tx_resources(struct e1000_adapter *adapter);

void e1000_update_stats(struct e1000_adapter *adapter);

bool e1000_has_link(struct e1000_adapter *adapter);

void e1000_power_up_phy(struct e1000_adapter *);

void e1000_set_ethtool_ops(struct net_device *netdev);

void e1000_check_options(struct e1000_adapter *adapter);

char *e1000_get_hw_dev_name(struct e1000_hw *hw);



#endif /* _E1000_H_ */