diff --git a/[refs] b/[refs] index 9b8b37d1bcfa..4a9aed792f86 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 49cf3f29a1ef2e59f1be823e376c1fbac586eb8d +refs/heads/master: 850492760cfd38d14d64a5fc6d636091464f755e diff --git a/trunk/arch/arm/include/asm/i8253.h b/trunk/arch/arm/include/asm/i8253.h deleted file mode 100644 index fee59eb4581d..000000000000 --- a/trunk/arch/arm/include/asm/i8253.h +++ /dev/null @@ -1,4 +0,0 @@ -#ifndef __ASMARM_I8253_H -#define __ASMARM_I8253_H - -#endif diff --git a/trunk/arch/mips/include/asm/i8253.h b/trunk/arch/mips/include/asm/i8253.h deleted file mode 100644 index 26f4eb197c3a..000000000000 --- a/trunk/arch/mips/include/asm/i8253.h +++ /dev/null @@ -1,10 +0,0 @@ -/* - * Machine specific IO port address definition for generic. - * Written by Osamu Tomita - */ -#ifndef __ASM_I8253_H -#define __ASM_I8253_H - -extern void setup_pit_timer(void); - -#endif /* __ASM_I8253_H */ diff --git a/trunk/arch/x86/include/asm/i8253.h b/trunk/arch/x86/include/asm/i8253.h deleted file mode 100644 index 0049dc9fbfee..000000000000 --- a/trunk/arch/x86/include/asm/i8253.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef _ASM_X86_I8253_H -#define _ASM_X86_I8253_H - -extern void setup_pit_timer(void); - -#endif /* _ASM_X86_I8253_H */ diff --git a/trunk/include/linux/i8253.h b/trunk/include/linux/i8253.h index 1ec6323a1507..76039c86ab58 100644 --- a/trunk/include/linux/i8253.h +++ b/trunk/include/linux/i8253.h @@ -12,7 +12,6 @@ #include #include #include -#include /* i8253A PIT registers */ #define PIT_MODE 0x43 @@ -26,4 +25,6 @@ extern raw_spinlock_t i8253_lock; +extern void setup_pit_timer(void); + #endif /* __LINUX_I8253_H */