diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2009-09-01 00:54:14 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2009-09-01 00:54:14 -0400 |
| commit | ac6a0cf6716bb46813d0161024c66c2af66e53d1 (patch) | |
| tree | c7f53b1a04c590032c022549f3186fb9b04f8358 /arch/powerpc/include/asm/device.h | |
| parent | e76a0136a3cf1859fbc07f122e42293d22229558 (diff) | |
| parent | ce3f7cb96e67d6518c7fc7b361a76409c3817d64 (diff) | |
Merge branch 'master' into sh/smp
Conflicts:
arch/sh/mm/cache-sh4.c
Diffstat (limited to 'arch/powerpc/include/asm/device.h')
| -rw-r--r-- | arch/powerpc/include/asm/device.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/powerpc/include/asm/device.h b/arch/powerpc/include/asm/device.h index 7d2277cef09a..e3e06e0f7fc0 100644 --- a/arch/powerpc/include/asm/device.h +++ b/arch/powerpc/include/asm/device.h | |||
| @@ -30,4 +30,7 @@ dev_archdata_get_node(const struct dev_archdata *ad) | |||
| 30 | return ad->of_node; | 30 | return ad->of_node; |
| 31 | } | 31 | } |
| 32 | 32 | ||
| 33 | struct pdev_archdata { | ||
| 34 | }; | ||
| 35 | |||
| 33 | #endif /* _ASM_POWERPC_DEVICE_H */ | 36 | #endif /* _ASM_POWERPC_DEVICE_H */ |