Skip to content

L
linux
Commit 45bcb92a authored by David S. Miller's avatar David S. Miller
Browse files
Options

Dont const objects put into initdata.

parent 0e8b438b
Show whitespace changes
Inline Side-by-side
Showing with 39 additions and 39 deletions
drivers/video/aty/atyfb_base.c
View file @ 45bcb92a
...@@ -251,7 +251,7 @@ static int default_pll __initdata = 0; ...@@ -251,7 +251,7 @@ static int default_pll __initdata = 0;
static int default_mclk __initdata = 0; static int default_mclk __initdata = 0;
#ifndef MODULE #ifndef MODULE
static const char *mode_option __initdata = NULL; static char *mode_option __initdata = NULL;
#endif #endif
#ifdef CONFIG_PPC #ifdef CONFIG_PPC
...@@ -271,33 +271,33 @@ static unsigned long phys_size[FB_MAX] __initdata = { 0, }; ...@@ -271,33 +271,33 @@ static unsigned long phys_size[FB_MAX] __initdata = { 0, };
static unsigned long phys_guiregbase[FB_MAX] __initdata = { 0, }; static unsigned long phys_guiregbase[FB_MAX] __initdata = { 0, };
#endif #endif
static const char m64n_gx[] __initdata = "mach64GX (ATI888GX00)"; static char m64n_gx[] __initdata = "mach64GX (ATI888GX00)";
static const char m64n_cx[] __initdata = "mach64CX (ATI888CX00)"; static char m64n_cx[] __initdata = "mach64CX (ATI888CX00)";
static const char m64n_ct[] __initdata = "mach64CT (ATI264CT)"; static char m64n_ct[] __initdata = "mach64CT (ATI264CT)";
static const char m64n_et[] __initdata = "mach64ET (ATI264ET)"; static char m64n_et[] __initdata = "mach64ET (ATI264ET)";
static const char m64n_vta3[] __initdata = "mach64VTA3 (ATI264VT)"; static char m64n_vta3[] __initdata = "mach64VTA3 (ATI264VT)";
static const char m64n_vta4[] __initdata = "mach64VTA4 (ATI264VT)"; static char m64n_vta4[] __initdata = "mach64VTA4 (ATI264VT)";
static const char m64n_vtb[] __initdata = "mach64VTB (ATI264VTB)"; static char m64n_vtb[] __initdata = "mach64VTB (ATI264VTB)";
static const char m64n_vt4[] __initdata = "mach64VT4 (ATI264VT4)"; static char m64n_vt4[] __initdata = "mach64VT4 (ATI264VT4)";
static const char m64n_gt[] __initdata = "3D RAGE (GT)"; static char m64n_gt[] __initdata = "3D RAGE (GT)";
static const char m64n_gtb[] __initdata = "3D RAGE II+ (GTB)"; static char m64n_gtb[] __initdata = "3D RAGE II+ (GTB)";
static const char m64n_iic_p[] __initdata = "3D RAGE IIC (PCI)"; static char m64n_iic_p[] __initdata = "3D RAGE IIC (PCI)";
static const char m64n_iic_a[] __initdata = "3D RAGE IIC (AGP)"; static char m64n_iic_a[] __initdata = "3D RAGE IIC (AGP)";
static const char m64n_lt[] __initdata = "3D RAGE LT"; static char m64n_lt[] __initdata = "3D RAGE LT";
static const char m64n_ltg[] __initdata = "3D RAGE LT-G"; static char m64n_ltg[] __initdata = "3D RAGE LT-G";
static const char m64n_gtc_ba[] __initdata = "3D RAGE PRO (BGA, AGP)"; static char m64n_gtc_ba[] __initdata = "3D RAGE PRO (BGA, AGP)";
static const char m64n_gtc_ba1[] __initdata = "3D RAGE PRO (BGA, AGP, 1x only)"; static char m64n_gtc_ba1[] __initdata = "3D RAGE PRO (BGA, AGP, 1x only)";
static const char m64n_gtc_bp[] __initdata = "3D RAGE PRO (BGA, PCI)"; static char m64n_gtc_bp[] __initdata = "3D RAGE PRO (BGA, PCI)";
static const char m64n_gtc_pp[] __initdata = "3D RAGE PRO (PQFP, PCI)"; static char m64n_gtc_pp[] __initdata = "3D RAGE PRO (PQFP, PCI)";
static const char m64n_gtc_ppl[] __initdata = "3D RAGE PRO (PQFP, PCI, limited 3D)"; static char m64n_gtc_ppl[] __initdata = "3D RAGE PRO (PQFP, PCI, limited 3D)";
static const char m64n_xl[] __initdata = "3D RAGE (XL)"; static char m64n_xl[] __initdata = "3D RAGE (XL)";
static const char m64n_ltp_a[] __initdata = "3D RAGE LT PRO (AGP)"; static char m64n_ltp_a[] __initdata = "3D RAGE LT PRO (AGP)";
static const char m64n_ltp_p[] __initdata = "3D RAGE LT PRO (PCI)"; static char m64n_ltp_p[] __initdata = "3D RAGE LT PRO (PCI)";
static const char m64n_mob_p[] __initdata = "3D RAGE Mobility (PCI)"; static char m64n_mob_p[] __initdata = "3D RAGE Mobility (PCI)";
static const char m64n_mob_a[] __initdata = "3D RAGE Mobility (AGP)"; static char m64n_mob_a[] __initdata = "3D RAGE Mobility (AGP)";
static const struct { static struct {
u16 pci_id, chip_type; u16 pci_id, chip_type;
u8 rev_mask, rev_val; u8 rev_mask, rev_val;
const char *name; const char *name;
...@@ -357,24 +357,24 @@ static const struct { ...@@ -357,24 +357,24 @@ static const struct {
#endif /* CONFIG_FB_ATY_CT */ #endif /* CONFIG_FB_ATY_CT */
}; };
static const char ram_dram[] __initdata = "DRAM"; static char ram_dram[] __initdata = "DRAM";
static const char ram_vram[] __initdata = "VRAM"; static char ram_vram[] __initdata = "VRAM";
static const char ram_edo[] __initdata = "EDO"; static char ram_edo[] __initdata = "EDO";
static const char ram_sdram[] __initdata = "SDRAM"; static char ram_sdram[] __initdata = "SDRAM";
static const char ram_sgram[] __initdata = "SGRAM"; static char ram_sgram[] __initdata = "SGRAM";
static const char ram_wram[] __initdata = "WRAM"; static char ram_wram[] __initdata = "WRAM";
static const char ram_off[] __initdata = "OFF"; static char ram_off[] __initdata = "OFF";
static const char ram_resv[] __initdata = "RESV"; static char ram_resv[] __initdata = "RESV";
#ifdef CONFIG_FB_ATY_GX #ifdef CONFIG_FB_ATY_GX
static const char *aty_gx_ram[8] __initdata = { static char *aty_gx_ram[8] __initdata = {
ram_dram, ram_vram, ram_vram, ram_dram, ram_dram, ram_vram, ram_vram, ram_dram,
ram_dram, ram_vram, ram_vram, ram_resv ram_dram, ram_vram, ram_vram, ram_resv
}; };
#endif /* CONFIG_FB_ATY_GX */ #endif /* CONFIG_FB_ATY_GX */
#ifdef CONFIG_FB_ATY_CT #ifdef CONFIG_FB_ATY_CT
static const char *aty_ct_ram[8] __initdata = { static char *aty_ct_ram[8] __initdata = {
ram_off, ram_dram, ram_edo, ram_edo, ram_off, ram_dram, ram_edo, ram_edo,
ram_sdram, ram_sgram, ram_wram, ram_resv ram_sdram, ram_sgram, ram_wram, ram_resv
}; };
......
drivers/video/pm2fb.c
View file @ 45bcb92a
...@@ -129,7 +129,7 @@ static struct { ...@@ -129,7 +129,7 @@ static struct {
static char curblink __initdata = 1; static char curblink __initdata = 1;
static const struct { static struct {
char name[16]; char name[16];
struct pm2fb_par par; struct pm2fb_par par;
} user_mode[] __initdata = { } user_mode[] __initdata = {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7