mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 19:21:31 -04:00
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
This commit is contained in:
commit
18115f4537
3 changed files with 6 additions and 6 deletions
|
|
@ -66,7 +66,7 @@ static void set_ctrlr_state(struct pxafb_info *fbi, u_int state);
|
|||
|
||||
#ifdef CONFIG_FB_PXA_PARAMETERS
|
||||
#define PXAFB_OPTIONS_SIZE 256
|
||||
static char g_options[PXAFB_OPTIONS_SIZE] __initdata = "";
|
||||
static char g_options[PXAFB_OPTIONS_SIZE] __devinitdata = "";
|
||||
#endif
|
||||
|
||||
static inline void pxafb_schedule_work(struct pxafb_info *fbi, u_int state)
|
||||
|
|
|
|||
Loading…
Reference in a new issue