diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2006-09-24 17:05:59 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2006-09-24 17:05:59 -0400 |
| commit | 02b25fcff676125a88169c8a78d4c6dd647574ed (patch) | |
| tree | 372fc8e885be41ba1819b2767c8889ecd97ff948 /include/asm-powerpc/spu.h | |
| parent | 1694176a210189312e31b083bac1e1688981219a (diff) | |
| parent | a68aa1cc6f3203b8a332683ebde67a00f39eec43 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'include/asm-powerpc/spu.h')
| -rw-r--r-- | include/asm-powerpc/spu.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-powerpc/spu.h b/include/asm-powerpc/spu.h index c02d105d8294..b42b53c40f5d 100644 --- a/include/asm-powerpc/spu.h +++ b/include/asm-powerpc/spu.h | |||
| @@ -106,7 +106,7 @@ struct spu_context; | |||
| 106 | struct spu_runqueue; | 106 | struct spu_runqueue; |
| 107 | 107 | ||
| 108 | struct spu { | 108 | struct spu { |
| 109 | char *name; | 109 | const char *name; |
| 110 | unsigned long local_store_phys; | 110 | unsigned long local_store_phys; |
| 111 | u8 *local_store; | 111 | u8 *local_store; |
| 112 | unsigned long problem_phys; | 112 | unsigned long problem_phys; |