diff options
| author | Michael Ellerman <mpe@ellerman.id.au> | 2015-04-07 13:07:42 +1000 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2015-04-07 13:07:42 +1000 |
| commit | 28ea605caac49497e5e34a73ee4f4682fc035f1d (patch) | |
| tree | a9218849d16d167c7c3890a9fd33c239018bf166 /arch/powerpc/include/asm/mpic.h | |
| parent | 6a840791182c7dab3428c6f005776b50e62e53ef (diff) | |
| parent | d41444daba1fd65e5a998c83398f44524f638d07 (diff) | |
| download | linux-28ea605caac49497e5e34a73ee4f4682fc035f1d.tar.bz2 | |
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/scottwood/linux into next
Freescale updates from Scott:
"Highlights include BMan device tree nodes, an MSI erratum workaround, a
couple minor performance improvements, config updates, and misc
fixes/cleanup."
Diffstat (limited to 'arch/powerpc/include/asm/mpic.h')
| -rw-r--r-- | arch/powerpc/include/asm/mpic.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/powerpc/include/asm/mpic.h b/arch/powerpc/include/asm/mpic.h index 6ce63a7662f8..98697611e7b3 100644 --- a/arch/powerpc/include/asm/mpic.h +++ b/arch/powerpc/include/asm/mpic.h @@ -391,6 +391,9 @@ extern struct bus_type mpic_subsys; #define MPIC_REGSET_STANDARD MPIC_REGSET(0) /* Original MPIC */ #define MPIC_REGSET_TSI108 MPIC_REGSET(1) /* Tsi108/109 PIC */ +/* Get the version of primary MPIC */ +extern u32 fsl_mpic_primary_get_version(void); + /* Allocate the controller structure and setup the linux irq descs * for the range if interrupts passed in. No HW initialization is * actually performed. |