diff options
author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2011-09-20 13:51:04 +1000 |
---|---|---|
committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2011-09-20 15:52:38 +1000 |
commit | 1cce058b29e7eb8a71a72d8bb87eb7b4e0401c22 (patch) | |
tree | 493477b7a19606c66de2f003bca83672f2164cad /drivers/media/rc/nuvoton-cir.h | |
parent | c26afe9e8591f306d79aab8071f1d34e4f60b700 (diff) | |
parent | 9d037a777695993ec7437e5f451647dea7919d4c (diff) | |
download | linux-3.10-1cce058b29e7eb8a71a72d8bb87eb7b4e0401c22.tar.gz linux-3.10-1cce058b29e7eb8a71a72d8bb87eb7b4e0401c22.tar.bz2 linux-3.10-1cce058b29e7eb8a71a72d8bb87eb7b4e0401c22.zip |
Merge remote-tracking branch 'origin/master' into next
(Merge in order to get the PCIe mps/mrss code fixes)
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 1241fc89a36..0d5e0872a2e 100644 --- a/drivers/media/rc/nuvoton-cir.h +++ b/drivers/media/rc/nuvoton-cir.h @@ -67,7 +67,6 @@ static int debug; struct nvt_dev { struct pnp_dev *pdev; struct rc_dev *rdev; - struct ir_raw_event rawir; spinlock_t nvt_lock; |