| commit | 9ff9a26b786c35ee8d2a66222924a807ec851a9f | [log] [tgz] |
|---|---|---|
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | Mon Mar 30 14:04:53 2009 +1100 |
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | Mon Mar 30 14:04:53 2009 +1100 |
| tree | db432a17bccca1ca2c16907f0ee83ac449ed4012 | |
| parent | 0a3108beea9143225119d5e7c72a8e2c64f3eb7d [diff] [blame] | |
| parent | 0d34fb8e93ceba7b6dad0062dbb4a0813bacd75b [diff] [blame] |
Merge commit 'origin/master' into next Manual merge of: arch/powerpc/include/asm/elf.h drivers/i2c/busses/i2c-mpc.c
diff --git a/arch/powerpc/include/asm/mmu-book3e.h b/arch/powerpc/include/asm/mmu-book3e.h index c5363c3..7e74cff 100644 --- a/arch/powerpc/include/asm/mmu-book3e.h +++ b/arch/powerpc/include/asm/mmu-book3e.h
@@ -93,6 +93,8 @@ #ifndef __ASSEMBLY__ +extern unsigned int tlbcam_index; + typedef struct { unsigned int id; unsigned int active;