summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorPaul Mackerras <paulus@samba.org>2006-12-20 16:22:53 +1100
committerPaul Mackerras <paulus@samba.org>2006-12-20 16:22:53 +1100
commit3cd7613e25ffc0a76080045e179f984a32208829 (patch)
treed98e840c47e0b3fb132012d418bd758abe2e899e /include
parent825020c3866e7312947e17a0caa9dd1a5622bafc (diff)
parent4bc196266e61be1ea9391a6a52c0399c5b394e5b (diff)
downloadblackbird-op-linux-3cd7613e25ffc0a76080045e179f984a32208829.tar.gz
blackbird-op-linux-3cd7613e25ffc0a76080045e179f984a32208829.zip
Merge branch 'cell-merge' of master.kernel.org:/pub/scm/linux/kernel/git/arnd/cell-2.6
Diffstat (limited to 'include')
-rw-r--r--include/asm-powerpc/spu.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/asm-powerpc/spu.h b/include/asm-powerpc/spu.h
index fdad4267b447..3d90264e9d36 100644
--- a/include/asm-powerpc/spu.h
+++ b/include/asm-powerpc/spu.h
@@ -161,6 +161,7 @@ struct spu_syscall_block {
extern long spu_sys_callback(struct spu_syscall_block *s);
/* syscalls implemented in spufs */
+struct file;
extern struct spufs_calls {
asmlinkage long (*create_thread)(const char __user *name,
unsigned int flags, mode_t mode);
@@ -232,6 +233,7 @@ void spu_remove_sysdev_attr_group(struct attribute_group *attrs);
* to object-id spufs file from user space and the notifer
* function can assume that spu->ctx is valid.
*/
+struct notifier_block;
int spu_switch_event_register(struct notifier_block * n);
int spu_switch_event_unregister(struct notifier_block * n);
OpenPOWER on IntegriCloud