---

yaml --- r: 367035 b: refs/heads/master c: 2b64cbd h: refs/heads/master i: 367033: a489e3e 367031: 8bbb1fe v: v3
git-mirror · Apr 14, 2013 · 31a4234 · 31a4234
1 parent b26da3e
commit 31a4234
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7c15b715ef301a7f8bb2dc8de335497ffde568a6
+refs/heads/master: 2b64cbd1da7a026e0779a1ba61e83ac5fcf544e7
diff --git a/trunk/drivers/media/usb/em28xx/em28xx-cards.c b/trunk/drivers/media/usb/em28xx/em28xx-cards.c
@@ -2810,7 +2810,8 @@ static void request_module_async(struct work_struct *work)
 
 	if (dev->board.has_dvb)
 		request_module("em28xx-dvb");
-	if ((dev->board.ir_codes || dev->board.has_ir_i2c) && !disable_ir)
+	if (dev->board.has_snapshot_button ||
+	    ((dev->board.ir_codes || dev->board.has_ir_i2c) && !disable_ir))
 		request_module("em28xx-rc");
 #endif /* CONFIG_MODULES */
 }