diff options
Diffstat (limited to 'arch/x86/platform/mrst/mrst.c')
-rw-r--r-- | arch/x86/platform/mrst/mrst.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/platform/mrst/mrst.c b/arch/x86/platform/mrst/mrst.c index ad4ec1cb097e..475e2cd0f3c3 100644 --- a/arch/x86/platform/mrst/mrst.c +++ b/arch/x86/platform/mrst/mrst.c | |||
@@ -848,8 +848,7 @@ static void __init sfi_handle_ipc_dev(struct sfi_device_table_entry *entry) | |||
848 | if (mrst_has_msic()) | 848 | if (mrst_has_msic()) |
849 | return; | 849 | return; |
850 | 850 | ||
851 | /* ID as IRQ is a hack that will go away */ | 851 | pdev = platform_device_alloc(entry->name, 0); |
852 | pdev = platform_device_alloc(entry->name, entry->irq); | ||
853 | if (pdev == NULL) { | 852 | if (pdev == NULL) { |
854 | pr_err("out of memory for SFI platform device '%s'.\n", | 853 | pr_err("out of memory for SFI platform device '%s'.\n", |
855 | entry->name); | 854 | entry->name); |
@@ -1030,6 +1029,7 @@ static int __init pb_keys_init(void) | |||
1030 | num = sizeof(gpio_button) / sizeof(struct gpio_keys_button); | 1029 | num = sizeof(gpio_button) / sizeof(struct gpio_keys_button); |
1031 | for (i = 0; i < num; i++) { | 1030 | for (i = 0; i < num; i++) { |
1032 | gb[i].gpio = get_gpio_by_name(gb[i].desc); | 1031 | gb[i].gpio = get_gpio_by_name(gb[i].desc); |
1032 | pr_debug("info[%2d]: name = %s, gpio = %d\n", i, gb[i].desc, gb[i].gpio); | ||
1033 | if (gb[i].gpio == -1) | 1033 | if (gb[i].gpio == -1) |
1034 | continue; | 1034 | continue; |
1035 | 1035 | ||