aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrank Schaefer <fschaefer.oss@googlemail.com>2013-06-03 13:12:04 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2013-06-19 10:42:27 -0400
commitbc677fff1cde38ce8e14d6a2cb703a9fb134ab98 (patch)
tree47ae592f743bddd0ba6834e92680a189451f6c61
parentc074fc4c2990d48acab78d304054a6ff212f3d53 (diff)
[media] em28xx: move snapshot button bit definition for reg 0x0C from em28xx-input.c to em28xx.h
Signed-off-by: Frank Schäfer <fschaefer.oss@googlemail.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r--drivers/media/usb/em28xx/em28xx-input.c1
-rw-r--r--drivers/media/usb/em28xx/em28xx-reg.h3
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/usb/em28xx/em28xx-input.c b/drivers/media/usb/em28xx/em28xx-input.c
index 466b19d0d767..ea181e4b68c5 100644
--- a/drivers/media/usb/em28xx/em28xx-input.c
+++ b/drivers/media/usb/em28xx/em28xx-input.c
@@ -32,7 +32,6 @@
32 32
33#define EM28XX_SNAPSHOT_KEY KEY_CAMERA 33#define EM28XX_SNAPSHOT_KEY KEY_CAMERA
34#define EM28XX_SBUTTON_QUERY_INTERVAL 500 34#define EM28XX_SBUTTON_QUERY_INTERVAL 500
35#define EM28XX_R0C_USBSUSP_SNAPSHOT 0x20
36 35
37static unsigned int ir_debug; 36static unsigned int ir_debug;
38module_param(ir_debug, int, 0644); 37module_param(ir_debug, int, 0644);
diff --git a/drivers/media/usb/em28xx/em28xx-reg.h b/drivers/media/usb/em28xx/em28xx-reg.h
index af39ddbe01e0..0e0477847965 100644
--- a/drivers/media/usb/em28xx/em28xx-reg.h
+++ b/drivers/media/usb/em28xx/em28xx-reg.h
@@ -68,7 +68,8 @@
68 68
69 69
70#define EM28XX_R0A_CHIPID 0x0a 70#define EM28XX_R0A_CHIPID 0x0a
71#define EM28XX_R0C_USBSUSP 0x0c /* */ 71#define EM28XX_R0C_USBSUSP 0x0c
72#define EM28XX_R0C_USBSUSP_SNAPSHOT 0x20 /* 1=button pressed, needs reset */
72 73
73#define EM28XX_R0E_AUDIOSRC 0x0e 74#define EM28XX_R0E_AUDIOSRC 0x0e
74#define EM28XX_R0F_XCLK 0x0f 75#define EM28XX_R0F_XCLK 0x0f