diff options
| author | Michael Krufky <devnull@localhost> | 2005-09-04 13:36:10 +0000 |
|---|---|---|
| committer | Michael Krufky <devnull@localhost> | 2005-09-04 13:36:10 +0000 |
| commit | 38a9800a9c85a99a96b123ebd69e015a8cd3b822 (patch) | |
| tree | 7ff156cc5df3939d7c08c27e987e2a85f24180b6 | |
| parent | 1a9c432144122e9b1cf16e6adf5e0f3fbe5ea73e (diff) | |
| download | mediapointer-dvb-s2-38a9800a9c85a99a96b123ebd69e015a8cd3b822.tar.gz mediapointer-dvb-s2-38a9800a9c85a99a96b123ebd69e015a8cd3b822.tar.bz2 | |
* cx88-input.c: (cx88_ir_init):
* ir-kbd-gpio.c: (ir_probe):
- Fixed broken compile, due to input event device patch.
Signed-off-by: Michael Fair <michael@daclubhouse.net>
Signed-off-by: Michael Krufky <mkrufky@m1k.net>
| -rw-r--r-- | linux/drivers/media/video/cx88/cx88-input.c | 4 | ||||
| -rw-r--r-- | linux/drivers/media/video/ir-kbd-gpio.c | 4 | ||||
| -rw-r--r-- | v4l/ChangeLog | 9 |
3 files changed, 13 insertions, 4 deletions
diff --git a/linux/drivers/media/video/cx88/cx88-input.c b/linux/drivers/media/video/cx88/cx88-input.c index 0ba6c196b..b58cb3187 100644 --- a/linux/drivers/media/video/cx88/cx88-input.c +++ b/linux/drivers/media/video/cx88/cx88-input.c @@ -1,5 +1,5 @@ /* - * $Id: cx88-input.c,v 1.18 2005/09/02 22:00:49 mchehab Exp $ + * $Id: cx88-input.c,v 1.19 2005/09/04 13:36:10 mkrufky Exp $ * * Device driver for GPIO attached remote control interfaces * on Conexant 2388x based TV/DVB cards. @@ -446,7 +446,7 @@ int cx88_ir_init(struct cx88_core *core, struct pci_dev *pci) ir->input.id.vendor = pci->vendor; ir->input.id.product = pci->device; } - ir->dev.dev = &dev->pci->dev; + ir->input.dev = &pci->dev; /* record handles to ourself */ ir->core = core; diff --git a/linux/drivers/media/video/ir-kbd-gpio.c b/linux/drivers/media/video/ir-kbd-gpio.c index 491183067..ee41576c1 100644 --- a/linux/drivers/media/video/ir-kbd-gpio.c +++ b/linux/drivers/media/video/ir-kbd-gpio.c @@ -1,5 +1,5 @@ /* - * $Id: ir-kbd-gpio.c,v 1.14 2005/09/02 22:00:49 mchehab Exp $ + * $Id: ir-kbd-gpio.c,v 1.15 2005/09/04 13:36:10 mkrufky Exp $ * * Copyright (c) 2003 Gerd Knorr * Copyright (c) 2003 Pavel Machek @@ -355,7 +355,7 @@ static int ir_probe(struct device *dev) ir->input.id.vendor = sub->core->pci->vendor; ir->input.id.product = sub->core->pci->device; } - ir->dev.dev = &dev->pci->dev; + ir->input.dev = &sub->core->pci->dev; #endif if (ir->polling) { diff --git a/v4l/ChangeLog b/v4l/ChangeLog index d6e32c2bc..c5996417e 100644 --- a/v4l/ChangeLog +++ b/v4l/ChangeLog @@ -1,3 +1,12 @@ +2005-09-04 13:32 mkrufky + + * cx88-input.c: (cx88_ir_init): + * ir-kbd-gpio.c: (ir_probe): + - Fixed broken compile, due to input event device patch. + + Signed-off-by: Michael Fair <michael@daclubhouse.net> + Signed-off-by: Michael Krufky <mkrufky@m1k.net> + 2005-09-04 11:40 mchehab * msp3400.c: (msp34xx_modus): |