Skip to content

L
linux-davinci-2.6.23
Commit cd0cca7b authored by Linus Torvalds's avatar Linus Torvalds
Browse files
Options

Merge master.kernel.org:/home/rmk/linux-2.6-arm

parents 6d9885a8 3238c448
Show whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
include/asm-arm/arch-iop3xx/timex.h
View file @ cd0cca7b
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
* IOP3xx architecture timex specifications * IOP3xx architecture timex specifications
*/ */
#include <linux/config.h> #include <linux/config.h>
#include <asm/hardware.h>
#if defined(CONFIG_ARCH_IQ80321) || defined(CONFIG_ARCH_IQ31244) #if defined(CONFIG_ARCH_IQ80321) || defined(CONFIG_ARCH_IQ31244)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment