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 'drm-patches' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied...
[pandora-kernel.git]
/
include
/
asm-ppc
/
ibm4xx.h
diff --git
a/include/asm-ppc/ibm4xx.h
b/include/asm-ppc/ibm4xx.h
index
cf62b69
..
499c146
100644
(file)
--- a/
include/asm-ppc/ibm4xx.h
+++ b/
include/asm-ppc/ibm4xx.h
@@
-86,7
+86,7
@@
void ppc4xx_init(unsigned long r3, unsigned long r4, unsigned long r5,
#define PCI_DRAM_OFFSET 0
#endif
-#elif
CONFIG_44x
+#elif
defined(CONFIG_44x)
#if defined(CONFIG_BAMBOO)
#include <platforms/4xx/bamboo.h>