git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394...
[pandora-kernel.git]
/
drivers
/
video
/
bw2.c
diff --git
a/drivers/video/bw2.c
b/drivers/video/bw2.c
index
4332092
..
09f1b9b
100644
(file)
--- a/
drivers/video/bw2.c
+++ b/
drivers/video/bw2.c
@@
-275,7
+275,7
@@
static int __devinit bw2_do_default_mode(struct bw2_par *par,
static int __devinit bw2_probe(struct of_device *op, const struct of_device_id *match)
{
static int __devinit bw2_probe(struct of_device *op, const struct of_device_id *match)
{
- struct device_node *dp = op->node;
+ struct device_node *dp = op->
dev.of_
node;
struct fb_info *info;
struct bw2_par *par;
int linebytes, err;
struct fb_info *info;
struct bw2_par *par;
int linebytes, err;
@@
-376,8
+376,11
@@
static const struct of_device_id bw2_match[] = {
MODULE_DEVICE_TABLE(of, bw2_match);
static struct of_platform_driver bw2_driver = {
MODULE_DEVICE_TABLE(of, bw2_match);
static struct of_platform_driver bw2_driver = {
- .name = "bw2",
- .match_table = bw2_match,
+ .driver = {
+ .name = "bw2",
+ .owner = THIS_MODULE,
+ .of_match_table = bw2_match,
+ },
.probe = bw2_probe,
.remove = __devexit_p(bw2_remove),
};
.probe = bw2_probe,
.remove = __devexit_p(bw2_remove),
};