diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-08-18 13:28:21 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-08-18 13:28:21 -0400 |
| commit | 18115f45374d19ada218fc013aa5308baf5d283e (patch) | |
| tree | 820dbd1f044c3384f0bcb3ba42c211e24aa0bc0b /drivers/video | |
| parent | f0f12d85af8593e45fdf4a4d4c7cad240a6787a2 (diff) | |
| parent | daa7162f66ec7f85053b623a3d23ee30b13d036c (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
* master.kernel.org:/home/rmk/linux-2.6-arm:
[ARM] 4549/1: KS8695: Fix build errors
[ARM] 4546/1: s3c2410: fix architecture typo for s3c2442
[ARM] 4544/1: arm: fix section mismatch in pxa fb
Diffstat (limited to 'drivers/video')
| -rw-r--r-- | drivers/video/pxafb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/pxafb.c b/drivers/video/pxafb.c index 81e571d59b50..a280a52f8efe 100644 --- a/drivers/video/pxafb.c +++ b/drivers/video/pxafb.c | |||
| @@ -66,7 +66,7 @@ static void set_ctrlr_state(struct pxafb_info *fbi, u_int state); | |||
| 66 | 66 | ||
| 67 | #ifdef CONFIG_FB_PXA_PARAMETERS | 67 | #ifdef CONFIG_FB_PXA_PARAMETERS |
| 68 | #define PXAFB_OPTIONS_SIZE 256 | 68 | #define PXAFB_OPTIONS_SIZE 256 |
| 69 | static char g_options[PXAFB_OPTIONS_SIZE] __initdata = ""; | 69 | static char g_options[PXAFB_OPTIONS_SIZE] __devinitdata = ""; |
| 70 | #endif | 70 | #endif |
| 71 | 71 | ||
| 72 | static inline void pxafb_schedule_work(struct pxafb_info *fbi, u_int state) | 72 | static inline void pxafb_schedule_work(struct pxafb_info *fbi, u_int state) |