diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-28 18:07:55 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-28 18:07:55 -0400 |
| commit | cb28a1bbdb4790378e7366d6c9ee1d2340b84f92 (patch) | |
| tree | 316436f77dac75335fd2c3ef5f109e71606c50d3 /include/asm-m68k/mac_baboon.h | |
| parent | b6d4f7e3ef25beb8c658c97867d98883e69dc544 (diff) | |
| parent | f934fb19ef34730263e6afc01e8ec27a8a71470f (diff) | |
Merge branch 'linus' into core/generic-dma-coherent
Conflicts:
arch/x86/Kconfig
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/asm-m68k/mac_baboon.h')
| -rw-r--r-- | include/asm-m68k/mac_baboon.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/asm-m68k/mac_baboon.h b/include/asm-m68k/mac_baboon.h index e87850830be8..c2a042b8c349 100644 --- a/include/asm-m68k/mac_baboon.h +++ b/include/asm-m68k/mac_baboon.h | |||
| @@ -29,6 +29,4 @@ struct baboon { | |||
| 29 | */ | 29 | */ |
| 30 | }; | 30 | }; |
| 31 | 31 | ||
| 32 | extern volatile struct baboon *baboon; | ||
| 33 | |||
| 34 | #endif /* __ASSEMBLY **/ | 32 | #endif /* __ASSEMBLY **/ |