2 files changed, 2 insertions, 5 deletions

diff --git a/arch/arm/mach-s3c64xx/Kconfig b/arch/arm/mach-s3c64xx/Kconfig
index 283cb77d4721..20578536aec7 100644
--- a/arch/arm/mach-s3c64xx/Kconfig
+++ b/arch/arm/mach-s3c64xx/Kconfig
@@ -200,10 +200,7 @@ endchoice
 config SMDK6410_WM1190_EV1
         bool "Support Wolfson Microelectronics 1190-EV1 PMIC card"
         depends on MACH_SMDK6410
-        select MFD_WM8350_CONFIG_MODE_0
-        select MFD_WM8350_CONFIG_MODE_3
         select MFD_WM8350_I2C
-        select MFD_WM8352_CONFIG_MODE_0
         select REGULATOR
         select REGULATOR_WM8350
         select SAMSUNG_GPIO_EXTRA64
diff --git a/arch/arm/mach-s3c64xx/mach-crag6410-module.c b/arch/arm/mach-s3c64xx/mach-crag6410-module.c
index a946b759fabd..7ccfef227c77 100644
--- a/arch/arm/mach-s3c64xx/mach-crag6410-module.c
+++ b/arch/arm/mach-s3c64xx/mach-crag6410-module.c
@@ -208,7 +208,7 @@ static const struct i2c_board_info wm1277_devs[] = {
 static struct arizona_pdata wm5102_reva_pdata = {
         .ldoena = S3C64XX_GPN(7),
         .gpio_base = CODEC_GPIO_BASE,
-        .irq_active_high = true,
+        .irq_flags = IRQF_TRIGGER_HIGH,
         .micd_pol_gpio = CODEC_GPIO_BASE + 4,
         .micd_rate = 6,
         .gpio_defaults = {
@@ -238,7 +238,7 @@ static struct spi_board_info wm5102_reva_spi_devs[] = {
 static struct arizona_pdata wm5102_pdata = {
         .ldoena = S3C64XX_GPN(7),
         .gpio_base = CODEC_GPIO_BASE,
-        .irq_active_high = true,
+        .irq_flags = IRQF_TRIGGER_HIGH,
         .micd_pol_gpio = CODEC_GPIO_BASE + 2,
         .gpio_defaults = {
                 [2] = 0x10000, /* AIF3TXLRCLK */