---

yaml --- r: 331316 b: refs/heads/master c: fe47c58 h: refs/heads/master v: v3
git-mirror · Sep 23, 2012 · 5598bf8 · 5598bf8
1 parent 86e82e6
commit 5598bf8
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4848d460a7d4b2b5b22afda16b713cb753affa12
+refs/heads/master: fe47c58ba82c967729c76869a5f10a94c38754f3
diff --git a/trunk/arch/arm/mach-omap1/devices.c b/trunk/arch/arm/mach-omap1/devices.c
@@ -376,6 +376,9 @@ static struct platform_device omap1_rng_device = {
 
 static void omap1_init_rng(void)
 {
+	if (!cpu_is_omap16xx())
+		return;
+
 	(void) platform_device_register(&omap1_rng_device);
 }
 

diff --git a/trunk/drivers/char/hw_random/omap-rng.c b/trunk/drivers/char/hw_random/omap-rng.c
@@ -220,9 +220,6 @@ static struct platform_driver omap_rng_driver = {
 
 static int __init omap_rng_init(void)
 {
-	if (!cpu_is_omap16xx() && !cpu_is_omap24xx())
-		return -ENODEV;
-
 	return platform_driver_register(&omap_rng_driver);
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -376,6 +376,9 @@ static struct platform_device omap1_rng_device = { @@
     static void omap1_init_rng(void)
     {
+    	if (!cpu_is_omap16xx())
+    		return;
     	(void) platform_device_register(&omap1_rng_device);
     }
@@ Expand Down @@