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 'viafb-next' of git://github.com/schandinat/linux-2.6 into fbdev-fixes...
[pandora-kernel.git]
/
arch
/
arm
/
mach-ns9xxx
/
include
/
mach
/
board.h
diff --git
a/arch/arm/mach-ns9xxx/include/mach/board.h
b/arch/arm/mach-ns9xxx/include/mach/board.h
index
f7e9196
..
19ca6de
100644
(file)
--- a/
arch/arm/mach-ns9xxx/include/mach/board.h
+++ b/
arch/arm/mach-ns9xxx/include/mach/board.h
@@
-14,12
+14,10
@@
#include <asm/mach-types.h>
#define board_is_a9m9750dev() (0 \
#include <asm/mach-types.h>
#define board_is_a9m9750dev() (0 \
- || machine_is_cc9p9360dev() \
|| machine_is_cc9p9750dev() \
)
#define board_is_a9mvali() (0 \
|| machine_is_cc9p9750dev() \
)
#define board_is_a9mvali() (0 \
- || machine_is_cc9p9360val() \
|| machine_is_cc9p9750val() \
)
|| machine_is_cc9p9750val() \
)