git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.git]
/
include
/
asm-arm
/
arch-omap
/
hardware.h
diff --git
a/include/asm-arm/arch-omap/hardware.h
b/include/asm-arm/arch-omap/hardware.h
index
7909b72
..
481048d
100644
(file)
--- a/
include/asm-arm/arch-omap/hardware.h
+++ b/
include/asm-arm/arch-omap/hardware.h
@@
-37,7
+37,6
@@
#define __ASM_ARCH_OMAP_HARDWARE_H
#include <asm/sizes.h>
#define __ASM_ARCH_OMAP_HARDWARE_H
#include <asm/sizes.h>
-#include <linux/config.h>
#ifndef __ASSEMBLER__
#include <asm/types.h>
#include <asm/arch/cpu.h>
#ifndef __ASSEMBLER__
#include <asm/types.h>
#include <asm/arch/cpu.h>
@@
-298,6
+297,10
@@
#include "board-perseus2.h"
#endif
#include "board-perseus2.h"
#endif
+#ifdef CONFIG_MACH_OMAP_FSAMPLE
+#include "board-fsample.h"
+#endif
+
#ifdef CONFIG_MACH_OMAP_H3
#include "board-h3.h"
#endif
#ifdef CONFIG_MACH_OMAP_H3
#include "board-h3.h"
#endif