diff options
author | Takashi Iwai <tiwai@suse.de> | 2014-08-04 13:11:22 +0400 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2014-08-04 13:11:22 +0400 |
commit | 2e65b8916cce4436df29812610d2c2fecdb42b5a (patch) | |
tree | fdcae670bd651c8e772eb7cd60420eba5d26a0db /arch/sparc/include/asm/idprom.h | |
parent | 7440850c20b69658f322119d20a94dc914127cc7 (diff) | |
parent | 00ef99408b6cc8d86ca614ada8025aa3606860db (diff) | |
download | linux-2e65b8916cce4436df29812610d2c2fecdb42b5a.tar.xz |
Merge branch 'for-next' into for-linus
Diffstat (limited to 'arch/sparc/include/asm/idprom.h')
-rw-r--r-- | arch/sparc/include/asm/idprom.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sparc/include/asm/idprom.h b/arch/sparc/include/asm/idprom.h index 6976aa2439c6..3793f7f91c42 100644 --- a/arch/sparc/include/asm/idprom.h +++ b/arch/sparc/include/asm/idprom.h @@ -20,6 +20,6 @@ struct idprom { }; extern struct idprom *idprom; -extern void idprom_init(void); +void idprom_init(void); #endif /* !(_SPARC_IDPROM_H) */ |