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 'stable-3.2' into pandora-3.2
[pandora-kernel.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
8184669
..
54b64ea
100644
(file)
--- a/
arch/arm/mach-pxa/include/mach/hardware.h
+++ b/
arch/arm/mach-pxa/include/mach/hardware.h
@@
-337,8
+337,4
@@
extern unsigned int get_memclk_frequency_10khz(void);
extern unsigned long get_clock_tick_rate(void);
#endif
extern unsigned long get_clock_tick_rate(void);
#endif
-#if defined(CONFIG_MACH_ARMCORE) && defined(CONFIG_PCI)
-#define ARCH_HAS_DMA_SET_COHERENT_MASK
-#endif
-
#endif /* _ASM_ARCH_HARDWARE_H */
#endif /* _ASM_ARCH_HARDWARE_H */