diff options
| author | Wolfgang Denk <wd@denx.de> | 2012-05-20 22:33:44 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2012-05-20 22:33:44 +0200 |
| commit | 8bd07c9aaf4628931ab8da6eb0f83e517d9381a7 (patch) | |
| tree | a0b3d31f7b56426cef184f8e6c21fff2aedf49ce /include/common.h | |
| parent | ee3a55fdf00b54391e406217e53674449e70d78b (diff) | |
| parent | de30122bb58fee7b0f94bcfabab595b6ad757336 (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-net
* 'master' of git://git.denx.de/u-boot-net:
net: move bootfile init into eth_initialize
net: punt bd->bi_ip_addr
net: cosmetic: netconsole.c checkpatch compliance
net: cosmetic: tftp.* checkpatch compliance
net: cosmetic: sntp.* checkpatch compliance
net: cosmetic: rarp.* checkpatch compliance
net: cosmetic: nfs.* checkpatch compliance
net: cosmetic: net.c checkpatch compliance
net: cosmetic: eth.c checkpatch compliance
net: cosmetic: bootp.* checkpatch compliance
net: cosmetic: net.h checkpatch compliance
net: Remove volatile from net API
Diffstat (limited to 'include/common.h')
| -rw-r--r-- | include/common.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/common.h b/include/common.h index ff7126d35d8..eb9de1870fb 100644 --- a/include/common.h +++ b/include/common.h @@ -819,6 +819,10 @@ int pcmcia_init (void); #include <bootstage.h> +#ifdef CONFIG_SHOW_ACTIVITY +void show_activity(int arg); +#endif + /* Multicore arch functions */ #ifdef CONFIG_MP int cpu_status(int nr); |