projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'bkl/procfs' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic...
[linux-2.6-block.git]
/
arch
/
arm
/
mach-pxa
/
include
/
mach
/
hardware.h
diff --git
a/arch/arm/mach-pxa/include/mach/hardware.h
b/arch/arm/mach-pxa/include/mach/hardware.h
index 7515757d6911b152c249d32d7784bcbb61d769a1..3d8d8cb09685ca9113da07bb04ecf1f755ea71f2 100644
(file)
--- a/
arch/arm/mach-pxa/include/mach/hardware.h
+++ b/
arch/arm/mach-pxa/include/mach/hardware.h
@@
-202,7
+202,7
@@
#define __cpu_is_pxa950(id) \
({ \
unsigned int _id = (id) >> 4 & 0xfff; \
-
id == 0x697;
\
+
_id == 0x697;
\
})
#else
#define __cpu_is_pxa950(id) (0)