diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-07-30 04:36:03 (GMT) |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-07-30 04:36:03 (GMT) |
| commit | 3a1a8acf690873f0ee2d8a648c2ec185f4294bd2 (patch) | |
| tree | 4cd633c0836f7bb30c3ce28d9b85ac0e5c21a7e2 /include/asm-powerpc/cpm.h | |
| parent | 6e86841d05f371b5b9b86ce76c02aaee83352298 (diff) | |
| parent | cf0d19fb3032ebf2cf8e5217da00f51dc025aa8e (diff) | |
| download | linux-3a1a8acf690873f0ee2d8a648c2ec185f4294bd2.tar.xz | |
Merge commit 'kumar/kumar-next'
Diffstat (limited to 'include/asm-powerpc/cpm.h')
| -rw-r--r-- | include/asm-powerpc/cpm.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/asm-powerpc/cpm.h b/include/asm-powerpc/cpm.h index 63a5533..24d79e3 100644 --- a/include/asm-powerpc/cpm.h +++ b/include/asm-powerpc/cpm.h @@ -3,6 +3,7 @@ #include <linux/compiler.h> #include <linux/types.h> +#include <linux/of.h> /* Opcodes common to CPM1 and CPM2 */ @@ -100,4 +101,6 @@ unsigned long cpm_muram_offset(void __iomem *addr); dma_addr_t cpm_muram_dma(void __iomem *addr); int cpm_command(u32 command, u8 opcode); +int cpm2_gpiochip_add32(struct device_node *np); + #endif |