diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-04-18 13:07:43 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-04-18 13:07:43 -0400 |
| commit | d5381e42f64ca19f05c5799ffae5708acb6ed411 (patch) | |
| tree | 8b5e757a9847047102c475c6c583afc191d02e5b /drivers/video/pxafb.h | |
| parent | f030d60b30855e18ac5bf080fa9e576147623d18 (diff) | |
| parent | b3c27b51db9112d03864fdef44fa611dd69c1425 (diff) | |
ASoC: Merge branch 'for-2.6.39' into for-2.6.40
Fix trivial conflict caused by silly spelling fix patch.
Conflicts:
sound/soc/codecs/wm8994.c
Diffstat (limited to 'drivers/video/pxafb.h')
| -rw-r--r-- | drivers/video/pxafb.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/video/pxafb.h b/drivers/video/pxafb.h index 2353521c5c8c..26ba9fa3f737 100644 --- a/drivers/video/pxafb.h +++ b/drivers/video/pxafb.h | |||
| @@ -92,7 +92,8 @@ struct pxafb_layer_ops { | |||
| 92 | struct pxafb_layer { | 92 | struct pxafb_layer { |
| 93 | struct fb_info fb; | 93 | struct fb_info fb; |
| 94 | int id; | 94 | int id; |
| 95 | atomic_t usage; | 95 | int registered; |
| 96 | uint32_t usage; | ||
| 96 | uint32_t control[2]; | 97 | uint32_t control[2]; |
| 97 | 98 | ||
| 98 | struct pxafb_layer_ops *ops; | 99 | struct pxafb_layer_ops *ops; |