Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/olof/chrome...

[cascardo/linux.git] / drivers / platform / chrome / chromeos_laptop.c

diff --git a/drivers/platform/chrome/chromeos_laptop.c b/drivers/platform/chrome/chromeos_laptop.c
index 6ed6375..d866db8 100644 (file)
--- a/drivers/platform/chrome/chromeos_laptop.c
+++ b/drivers/platform/chrome/chromeos_laptop.c
@@ -111,8 +111,6 @@ static struct mxt_platform_data atmel_224s_tp_platform_data = {
        .irqflags               = IRQF_TRIGGER_FALLING,
        .t19_num_keys           = ARRAY_SIZE(mxt_t19_keys),
        .t19_keymap             = mxt_t19_keys,
-       .config                 = NULL,
-       .config_length          = 0,
 };
 
 static struct i2c_board_info atmel_224s_tp_device = {
@@ -123,8 +121,6 @@ static struct i2c_board_info atmel_224s_tp_device = {
 
 static struct mxt_platform_data atmel_1664s_platform_data = {
        .irqflags               = IRQF_TRIGGER_FALLING,
-       .config                 = NULL,
-       .config_length          = 0,
 };
 
 static struct i2c_board_info atmel_1664s_device = {