From 72d21438f95d738c59a162d7aaf903486b767aa4 Mon Sep 17 00:00:00 2001 From: Mark Brown Date: Wed, 20 Jun 2012 08:18:04 +0900 Subject: [PATCH] --- yaml --- r: 313463 b: refs/heads/master c: 7d1d8ce5b50f4593f6d4b9d8149f978c122f617b h: refs/heads/master i: 313461: c16a9a73615d76db93f8ea902ca46e6deaf7275e 313459: e12bbac07cf53f1f547c81059df3a0aa74c16e7b 313455: d7a4e738b65ce66e94dbb4bd59d1677136b886ed v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-s3c64xx/include/mach/crag6410.h | 1 - trunk/arch/arm/mach-s3c64xx/mach-crag6410-module.c | 1 - 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 4c750e6c7d55..4bee5284ce7a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9b6e1b0e882a00d654a8313e22c189f13c321a20 +refs/heads/master: 7d1d8ce5b50f4593f6d4b9d8149f978c122f617b diff --git a/trunk/arch/arm/mach-s3c64xx/include/mach/crag6410.h b/trunk/arch/arm/mach-s3c64xx/include/mach/crag6410.h index 4cb2f951f1e9..ec97c15b109e 100644 --- a/trunk/arch/arm/mach-s3c64xx/include/mach/crag6410.h +++ b/trunk/arch/arm/mach-s3c64xx/include/mach/crag6410.h @@ -15,7 +15,6 @@ #define BANFF_PMIC_IRQ_BASE IRQ_BOARD_START #define GLENFARCLAS_PMIC_IRQ_BASE (IRQ_BOARD_START + 64) -#define CODEC_IRQ_BASE (IRQ_BOARD_START + 128) #define PCA935X_GPIO_BASE GPIO_BOARD_START #define CODEC_GPIO_BASE (GPIO_BOARD_START + 8) diff --git a/trunk/arch/arm/mach-s3c64xx/mach-crag6410-module.c b/trunk/arch/arm/mach-s3c64xx/mach-crag6410-module.c index 497937222a29..4a83b4e7ab32 100644 --- a/trunk/arch/arm/mach-s3c64xx/mach-crag6410-module.c +++ b/trunk/arch/arm/mach-s3c64xx/mach-crag6410-module.c @@ -168,7 +168,6 @@ static struct wm8994_pdata wm8994_pdata = { .gpio_defaults = { 0x3, /* IRQ out, active high, CMOS */ }, - .irq_base = CODEC_IRQ_BASE, .ldo = { { .init_data = &wm8994_ldo1, }, { .init_data = &wm8994_ldo2, },