lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source
This commit is contained in:
Linus Torvalds
2005-11-24 18:41:59 -08:00
parent 6d9885a8ce 3238c448c6
commit cd0cca7bf5
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/asm-arm/arch-iop3xx/timex.h
View File

@@ -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)