From ec3069e867b73e526ba948e9eb4fa28207132412 Mon Sep 17 00:00:00 2001 From: Tobias Klauser Date: Tue, 21 Aug 2012 22:04:32 -0700 Subject: [PATCH] --- yaml --- r: 328520 b: refs/heads/master c: f4d4661bee0f54410ac65571b50df5d9fe091d03 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/input/keyboard/samsung-keypad.c | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 0a64cf4ca2a2..97cd3716f154 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 54ce165ebd9d9494b64149e0d1ab4ddbf5ea908b +refs/heads/master: f4d4661bee0f54410ac65571b50df5d9fe091d03 diff --git a/trunk/drivers/input/keyboard/samsung-keypad.c b/trunk/drivers/input/keyboard/samsung-keypad.c index a061ba603a29..e2f31c8489f5 100644 --- a/trunk/drivers/input/keyboard/samsung-keypad.c +++ b/trunk/drivers/input/keyboard/samsung-keypad.c @@ -662,8 +662,6 @@ static const struct of_device_id samsung_keypad_dt_match[] = { {}, }; MODULE_DEVICE_TABLE(of, samsung_keypad_dt_match); -#else -#define samsung_keypad_dt_match NULL #endif static struct platform_device_id samsung_keypad_driver_ids[] = { @@ -684,7 +682,7 @@ static struct platform_driver samsung_keypad_driver = { .driver = { .name = "samsung-keypad", .owner = THIS_MODULE, - .of_match_table = samsung_keypad_dt_match, + .of_match_table = of_match_ptr(samsung_keypad_dt_match), .pm = &samsung_keypad_pm_ops, }, .id_table = samsung_keypad_driver_ids,