[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <20101004171419.E3F3E9D401B@zog.reactivated.net>
Date: Mon, 4 Oct 2010 18:14:19 +0100 (BST)
From: Daniel Drake <dsd@...top.org>
To: x86@...nel.org
Cc: dilinger@...ued.net
Subject: [PATCH] OLPC: register XO-1 RF kill device
The upcoming XO-1 rfkill driver (for drivers/platform/x86) will register
itself with the name "xo1-rfkill"
Add the necessary mechanics so that this is properly probed and
initialized on XO-1 laptops.
Signed-off-by: Daniel Drake <dsd@...top.org>
---
arch/x86/kernel/olpc.c | 10 ++++++++++
1 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/arch/x86/kernel/olpc.c b/arch/x86/kernel/olpc.c
index 37c49934..d57f26a 100644
--- a/arch/x86/kernel/olpc.c
+++ b/arch/x86/kernel/olpc.c
@@ -17,6 +17,7 @@
#include <linux/spinlock.h>
#include <linux/io.h>
#include <linux/string.h>
+#include <linux/platform_device.h>
#include <asm/geode.h>
#include <asm/setup.h>
@@ -248,6 +249,15 @@ static int __init olpc_init(void)
olpc_platform_info.boardrev >> 4,
olpc_platform_info.ecver);
+ if (olpc_platform_info.boardrev < olpc_board_pre(0xd0)) { /* XO-1 */
+ struct platform_device *pdev;
+
+ /* register any relevant platform devices */
+ pdev = platform_device_register_simple("xo1-rfkill", -1, NULL, 0);
+ if (IS_ERR(pdev))
+ return PTR_ERR(pdev);
+ }
+
return 0;
}
--
1.7.2.3
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists