diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-03-26 10:03:03 +0000 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-03-26 10:03:03 +0000 |
commit | 938c0ace3ffb8cc2073a6d2e68fa7a6ab7cb471e (patch) | |
tree | 9257bdba52ce88ca0a0c2f6fce1f59a1eb278452 /drivers/video/pxafb.h | |
parent | 16c29dafcc86024048f1dbb8349d31cb22c7c55a (diff) | |
parent | 5898eb79fb45d4fd4ce22139c168de937bfaab38 (diff) | |
download | linux-938c0ace3ffb8cc2073a6d2e68fa7a6ab7cb471e.tar.bz2 |
Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into devel-stable
Conflicts:
arch/arm/mach-pxa/tosa.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 { struct pxafb_layer { struct fb_info fb; int id; - atomic_t usage; + int registered; + uint32_t usage; uint32_t control[2]; struct pxafb_layer_ops *ops; |