diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2011-04-07 20:15:50 +0200 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2011-04-07 20:15:50 +0200 |
| commit | 454abcc57f1d48a976291bc4af73b5f087e21d70 (patch) | |
| tree | 5bba999ea3f31527da02b60604531cc5fb52ea57 /drivers/video/pxafb.h | |
| parent | gpio/pch_gpio: Fix output value of pch_gpio_direction_output() (diff) | |
| parent | Linux 2.6.39-rc2 (diff) | |
| download | linux-454abcc57f1d48a976291bc4af73b5f087e21d70.tar.xz linux-454abcc57f1d48a976291bc4af73b5f087e21d70.zip | |
Merge commit 'v2.6.39-rc2' into spi/merge
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; |