git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...
[pandora-kernel.git]
/
arch
/
powerpc
/
include
/
asm
/
rio.h
diff --git
a/arch/powerpc/include/asm/rio.h
b/arch/powerpc/include/asm/rio.h
index
d902abd
..
b1d2dec
100644
(file)
--- a/
arch/powerpc/include/asm/rio.h
+++ b/
arch/powerpc/include/asm/rio.h
@@
-14,7
+14,7
@@
#define ASM_PPC_RIO_H
extern void platform_rio_init(void);
-#ifdef CONFIG_
RAPID
IO
+#ifdef CONFIG_
FSL_R
IO
extern int fsl_rio_mcheck_exception(struct pt_regs *);
#else
static inline int fsl_rio_mcheck_exception(struct pt_regs *regs) {return 0; }