Merge tag 'iwlwifi-for-kalle-2016-04-12_2' of https://git.kernel.org/pub/scm/linux...

[cascardo/linux.git] / arch / powerpc / include / asm / machdep.h

diff --git a/arch/powerpc/include/asm/machdep.h b/arch/powerpc/include/asm/machdep.h
index 3f191f5..fd22442 100644 (file)
--- a/arch/powerpc/include/asm/machdep.h
+++ b/arch/powerpc/include/asm/machdep.h
@@ -54,7 +54,7 @@ struct machdep_calls {
                                       int psize, int apsize,
                                       int ssize);
        long            (*hpte_remove)(unsigned long hpte_group);
-       void            (*hpte_removebolted)(unsigned long ea,
+       int             (*hpte_removebolted)(unsigned long ea,
                                             int psize, int ssize);
        void            (*flush_hash_range)(unsigned long number, int local);
        void            (*hugepage_invalidate)(unsigned long vsid,
@@ -174,11 +174,11 @@ struct machdep_calls {
           platform, called once per cpu. */
        void            (*enable_pmcs)(void);
 
-       /* Set DABR for this platform, leave empty for default implemenation */
+       /* Set DABR for this platform, leave empty for default implementation */
        int             (*set_dabr)(unsigned long dabr,
                                    unsigned long dabrx);
 
-       /* Set DAWR for this platform, leave empty for default implemenation */
+       /* Set DAWR for this platform, leave empty for default implementation */
        int             (*set_dawr)(unsigned long dawr,
                                    unsigned long dawrx);