projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge ../torvalds-2.6/
[powerpc.git]
/
drivers
/
media
/
video
/
ir-kbd-gpio.c
diff --git
a/drivers/media/video/ir-kbd-gpio.c
b/drivers/media/video/ir-kbd-gpio.c
index
a565823
..
cf292da
100644
(file)
--- a/
drivers/media/video/ir-kbd-gpio.c
+++ b/
drivers/media/video/ir-kbd-gpio.c
@@
-1,5
+1,4
@@
/*
/*
- * $Id: ir-kbd-gpio.c,v 1.13 2005/05/15 19:01:26 mchehab Exp $
*
* Copyright (c) 2003 Gerd Knorr
* Copyright (c) 2003 Pavel Machek
*
* Copyright (c) 2003 Gerd Knorr
* Copyright (c) 2003 Pavel Machek
@@
-354,6
+353,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->input.id.vendor = sub->core->pci->vendor;
ir->input.id.product = sub->core->pci->device;
}
+ ir->input.dev = &sub->core->pci->dev;
if (ir->polling) {
INIT_WORK(&ir->work, ir_work, ir);
if (ir->polling) {
INIT_WORK(&ir->work, ir_work, ir);