diff --git a/[refs] b/[refs] index 679e53154aff..f6bc030f3302 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5093bb965a163fe288c3e5db0275165f86c895c2 +refs/heads/master: 5848f16947026601b9cb4df694bb9f44dfefc354 diff --git a/trunk/arch/powerpc/sysdev/qe_lib/qe.c b/trunk/arch/powerpc/sysdev/qe_lib/qe.c index 28e05df952de..9e82d7e725a5 100644 --- a/trunk/arch/powerpc/sysdev/qe_lib/qe.c +++ b/trunk/arch/powerpc/sysdev/qe_lib/qe.c @@ -87,7 +87,7 @@ phys_addr_t get_qe_base(void) EXPORT_SYMBOL(get_qe_base); -void qe_reset(void) +void __init qe_reset(void) { if (qe_immr == NULL) qe_immr = ioremap(get_qe_base(), QE_IMMAP_SIZE); diff --git a/trunk/include/asm-powerpc/qe.h b/trunk/include/asm-powerpc/qe.h index 80807fd6a706..1355e7267013 100644 --- a/trunk/include/asm-powerpc/qe.h +++ b/trunk/include/asm-powerpc/qe.h @@ -84,7 +84,7 @@ static inline bool qe_clock_is_brg(enum qe_clock clk) extern spinlock_t cmxgcr_lock; /* Export QE common operations */ -extern void qe_reset(void); +extern void __init qe_reset(void); /* QE PIO */ #define QE_PIO_PINS 32