diff options
author | Dave Airlie <airlied@redhat.com> | 2015-08-24 16:36:42 +1000 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2015-08-24 16:36:42 +1000 |
commit | 3732ce72b45a2a145803558758821bf198751276 (patch) | |
tree | 75047ed1f43cfd56231535c401924dbb27c4d0f0 /drivers/media/rc/nuvoton-cir.h | |
parent | e829d7ef9f17d7b84d4c3d110ecd4b7b2bcba865 (diff) | |
parent | c13dcf9f2d6f5f06ef1bf79ec456df614c5e058b (diff) | |
download | op-kernel-dev-3732ce72b45a2a145803558758821bf198751276.zip op-kernel-dev-3732ce72b45a2a145803558758821bf198751276.tar.gz |
Merge tag 'v4.2-rc8' into drm-next
Linux 4.2-rc8
Backmerge required for Intel so they can fix their -next tree up properly.
Diffstat (limited to 'drivers/media/rc/nuvoton-cir.h')
-rw-r--r-- | drivers/media/rc/nuvoton-cir.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/media/rc/nuvoton-cir.h b/drivers/media/rc/nuvoton-cir.h index 9d0e161..e1cf23c 100644 --- a/drivers/media/rc/nuvoton-cir.h +++ b/drivers/media/rc/nuvoton-cir.h @@ -63,7 +63,6 @@ static int debug; */ #define TX_BUF_LEN 256 #define RX_BUF_LEN 32 -#define WAKE_FIFO_LEN 67 struct nvt_dev { struct pnp_dev *pdev; |