diff --git a/[refs] b/[refs] index 29a9794805a5..a82f50fb0a20 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: dd3db6eb0e47b4480eeea30394d19bd826e64964 +refs/heads/master: f6a8cc31aa23318c6c95aabad7f49874fb79e527 diff --git a/trunk/include/asm-mips/i8253.h b/trunk/include/asm-mips/i8253.h index affb32ce4af9..778b2f023905 100644 --- a/trunk/include/asm-mips/i8253.h +++ b/trunk/include/asm-mips/i8253.h @@ -10,21 +10,6 @@ #define PIT_CH0 0x40 #define PIT_CH2 0x42 -/* i8259A PIC registers */ -#define PIC_MASTER_CMD 0x20 -#define PIC_MASTER_IMR 0x21 -#define PIC_MASTER_ISR PIC_MASTER_CMD -#define PIC_MASTER_POLL PIC_MASTER_ISR -#define PIC_MASTER_OCW3 PIC_MASTER_ISR -#define PIC_SLAVE_CMD 0xa0 -#define PIC_SLAVE_IMR 0xa1 - -/* i8259A PIC related value */ -#define PIC_CASCADE_IR 2 -#define MASTER_ICW4_DEFAULT 0x01 -#define SLAVE_ICW4_DEFAULT 0x01 -#define PIC_ICW4_AEOI 2 - extern void setup_pit_timer(void); #endif /* __ASM_I8253_H */