diff options
author | Philippe Langlais <philippe.langlais@stericsson.com> | 2012-06-04 19:46:24 +0800 |
---|---|---|
committer | Philippe Langlais <philippe.langlais@stericsson.com> | 2012-06-04 19:46:24 +0800 |
commit | 29a3e1ef73daaa91cbf5cce2fb475f1878254402 (patch) | |
tree | fbd1df992706a4786633a7986a31b9cf78b3dced /drivers/staging/android/ram_console.c | |
parent | 564119271649aa2d1840e79badf743e957b497e6 (diff) | |
parent | 3c16bd7bb0a2b00b71f65bb0075e0c94d0fcc777 (diff) |
Merge Linaro Android branch ' jstultz/linaro-android-3.4
' into integration-android-ux500
Signed-off-by: Philippe Langlais <philippe.langlais@stericsson.com>
Diffstat (limited to 'drivers/staging/android/ram_console.c')
-rw-r--r-- | drivers/staging/android/ram_console.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/staging/android/ram_console.c b/drivers/staging/android/ram_console.c index ce140ffc54e..8e4038b9a40 100644 --- a/drivers/staging/android/ram_console.c +++ b/drivers/staging/android/ram_console.c @@ -16,12 +16,12 @@ #include <linux/console.h> #include <linux/init.h> #include <linux/module.h> +#include <linux/persistent_ram.h> #include <linux/platform_device.h> #include <linux/proc_fs.h> #include <linux/string.h> #include <linux/uaccess.h> #include <linux/io.h> -#include "persistent_ram.h" #include "ram_console.h" static struct persistent_ram_zone *ram_console_zone; @@ -50,7 +50,7 @@ void ram_console_enable_console(int enabled) ram_console.flags &= ~CON_ENABLED; } -static int __init ram_console_probe(struct platform_device *pdev) +static int __devinit ram_console_probe(struct platform_device *pdev) { struct ram_console_platform_data *pdata = pdev->dev.platform_data; struct persistent_ram_zone *prz; @@ -78,11 +78,12 @@ static struct platform_driver ram_console_driver = { .driver = { .name = "ram_console", }, + .probe = ram_console_probe, }; static int __init ram_console_module_init(void) { - return platform_driver_probe(&ram_console_driver, ram_console_probe); + return platform_driver_register(&ram_console_driver); } #ifndef CONFIG_PRINTK |