diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-06-18 04:53:12 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-06-18 04:53:19 -0400 |
| commit | 646b1db4956ba8bf748b835b5eba211133d91c2e (patch) | |
| tree | 061166d873d9da9cf83044a7593ad111787076c5 /drivers/video/bw2.c | |
| parent | 0f2c3de2ba110626515234d5d584fb1b0c0749a2 (diff) | |
| parent | 7e27d6e778cd87b6f2415515d7127eba53fe5d02 (diff) | |
Merge commit 'v2.6.35-rc3' into perf/core
Merge reason: Go from -rc1 base to -rc3 base, merge in fixes.
Diffstat (limited to 'drivers/video/bw2.c')
| -rw-r--r-- | drivers/video/bw2.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/bw2.c b/drivers/video/bw2.c index 2c371c07f0da..09f1b9b462f4 100644 --- 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, | |||
| 275 | 275 | ||
| 276 | static int __devinit bw2_probe(struct of_device *op, const struct of_device_id *match) | 276 | static int __devinit bw2_probe(struct of_device *op, const struct of_device_id *match) |
| 277 | { | 277 | { |
| 278 | struct device_node *dp = op->node; | 278 | struct device_node *dp = op->dev.of_node; |
| 279 | struct fb_info *info; | 279 | struct fb_info *info; |
| 280 | struct bw2_par *par; | 280 | struct bw2_par *par; |
| 281 | int linebytes, err; | 281 | int linebytes, err; |