Commit cd0cca7b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

parents 6d9885a8 3238c448

include/asm-arm/arch-iop3xx/timex.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -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)

CRA Git | Maintained and supported by SUSTech CRA and CCSE