diff options
author | Paul Mundt <lethal@linux-sh.org> | 2009-09-01 13:54:14 +0900 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2009-09-01 13:54:14 +0900 |
commit | ac6a0cf6716bb46813d0161024c66c2af66e53d1 (patch) | |
tree | c7f53b1a04c590032c022549f3186fb9b04f8358 /arch/sparc/include/asm/device.h | |
parent | e76a0136a3cf1859fbc07f122e42293d22229558 (diff) | |
parent | ce3f7cb96e67d6518c7fc7b361a76409c3817d64 (diff) | |
download | kernel_samsung_smdk4412-ac6a0cf6716bb46813d0161024c66c2af66e53d1.zip kernel_samsung_smdk4412-ac6a0cf6716bb46813d0161024c66c2af66e53d1.tar.gz kernel_samsung_smdk4412-ac6a0cf6716bb46813d0161024c66c2af66e53d1.tar.bz2 |
Merge branch 'master' into sh/smp
Conflicts:
arch/sh/mm/cache-sh4.c
Diffstat (limited to 'arch/sparc/include/asm/device.h')
-rw-r--r-- | arch/sparc/include/asm/device.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/sparc/include/asm/device.h b/arch/sparc/include/asm/device.h index 3702e08..f3b85b6 100644 --- a/arch/sparc/include/asm/device.h +++ b/arch/sparc/include/asm/device.h @@ -32,4 +32,7 @@ dev_archdata_get_node(const struct dev_archdata *ad) return ad->prom_node; } +struct pdev_archdata { +}; + #endif /* _ASM_SPARC_DEVICE_H */ |