Merge master.kernel.org:/home/rmk/linux-2.6-arm
This commit is contained in:
commit
cd0cca7bf5
|
@ -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)
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue