diff --git a/[refs] b/[refs] index b4cce943a2ce..0bd4dbb8e32f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e2714f79edb8ed4f9afd09ca48bf2abaa994b1c1 +refs/heads/master: 1ebc7e83b1cc58edae3f371ac9cf1614e0d3b345 diff --git a/trunk/drivers/irqchip/irq-s3c24xx.c b/trunk/drivers/irqchip/irq-s3c24xx.c index 84afbc16fcc3..a565eb8def30 100644 --- a/trunk/drivers/irqchip/irq-s3c24xx.c +++ b/trunk/drivers/irqchip/irq-s3c24xx.c @@ -835,13 +835,12 @@ static struct s3c_irq_data init_s3c2416subint[32] = { static struct s3c_irq_data init_s3c2416_second[32] = { { .type = S3C_IRQTYPE_EDGE }, /* 2D */ - { .type = S3C_IRQTYPE_EDGE }, /* IIC1 */ + { .type = S3C_IRQTYPE_NONE }, /* reserved */ { .type = S3C_IRQTYPE_NONE }, /* reserved */ { .type = S3C_IRQTYPE_NONE }, /* reserved */ { .type = S3C_IRQTYPE_EDGE }, /* PCM0 */ - { .type = S3C_IRQTYPE_EDGE }, /* PCM1 */ + { .type = S3C_IRQTYPE_NONE }, /* reserved */ { .type = S3C_IRQTYPE_EDGE }, /* I2S0 */ - { .type = S3C_IRQTYPE_EDGE }, /* I2S1 */ }; void __init s3c2416_init_irq(void)