diff options
| author | Michael Ellerman <mpe@ellerman.id.au> | 2018-01-21 23:32:02 +1100 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2018-01-21 23:32:02 +1100 |
| commit | 4afa0f3a89ca4b60066a5278c2e13dd29118d672 (patch) | |
| tree | 9b417cf722970e7a669c662c2aade849c7adab62 /arch/powerpc/include | |
| parent | ebf0b6a8b1e445d2be66087732aafcda12ab9f59 (diff) | |
| parent | c095ff93f901c1620b28dce4d813dd548bc5236b (diff) | |
| download | linux-4afa0f3a89ca4b60066a5278c2e13dd29118d672.tar.bz2 | |
Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/scottwood/linux into next
Freescale updates from Scott:
"Contains fixes for CPM GPIO and an FSL PCI erratum workaround, plus a
minor cleanup patch."
Diffstat (limited to 'arch/powerpc/include')
| -rw-r--r-- | arch/powerpc/include/asm/cpm.h | 2 | ||||
| -rw-r--r-- | arch/powerpc/include/asm/cpm1.h | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/arch/powerpc/include/asm/cpm.h b/arch/powerpc/include/asm/cpm.h index b925df1b87d0..4c24ea8209bb 100644 --- a/arch/powerpc/include/asm/cpm.h +++ b/arch/powerpc/include/asm/cpm.h @@ -166,6 +166,6 @@ static inline int cpm_command(u32 command, u8 opcode) } #endif /* CONFIG_CPM */ -int cpm2_gpiochip_add32(struct device_node *np); +int cpm2_gpiochip_add32(struct device *dev); #endif diff --git a/arch/powerpc/include/asm/cpm1.h b/arch/powerpc/include/asm/cpm1.h index 3db821876d48..a116fe931789 100644 --- a/arch/powerpc/include/asm/cpm1.h +++ b/arch/powerpc/include/asm/cpm1.h @@ -605,5 +605,7 @@ enum cpm_clk { }; int cpm1_clk_setup(enum cpm_clk_target target, int clock, int mode); +int cpm1_gpiochip_add16(struct device *dev); +int cpm1_gpiochip_add32(struct device *dev); #endif /* __CPM1__ */ |