diff options
author | David S. Miller <davem@davemloft.net> | 2013-01-15 15:05:59 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2013-01-15 15:05:59 -0500 |
commit | 4b87f922598acf91eee18f71688a33f54f57bcde (patch) | |
tree | 9cdfe30c6b96c47093da5392ed82d147290cd64c /drivers/video/via/hw.c | |
parent | 55eb555d9674e2ebe9d4de0146602f96ff18e7d6 (diff) | |
parent | daf3ec688e057f6060fb9bb0819feac7a8bbf45c (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
Documentation/networking/ip-sysctl.txt
drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
Both conflicts were simply overlapping context.
A build fix for qlcnic is in here too, simply removing the added
devinit annotations which no longer exist.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/video/via/hw.c')
-rw-r--r-- | drivers/video/via/hw.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/video/via/hw.c b/drivers/video/via/hw.c index 898590db5e14..80233dae358a 100644 --- a/drivers/video/via/hw.c +++ b/drivers/video/via/hw.c | |||
@@ -465,9 +465,9 @@ static struct via_device_mapping device_mapping[] = { | |||
465 | static struct via_clock clock; | 465 | static struct via_clock clock; |
466 | 466 | ||
467 | static void load_fix_bit_crtc_reg(void); | 467 | static void load_fix_bit_crtc_reg(void); |
468 | static void __devinit init_gfx_chip_info(int chip_type); | 468 | static void init_gfx_chip_info(int chip_type); |
469 | static void __devinit init_tmds_chip_info(void); | 469 | static void init_tmds_chip_info(void); |
470 | static void __devinit init_lvds_chip_info(void); | 470 | static void init_lvds_chip_info(void); |
471 | static void device_screen_off(void); | 471 | static void device_screen_off(void); |
472 | static void device_screen_on(void); | 472 | static void device_screen_on(void); |
473 | static void set_display_channel(void); | 473 | static void set_display_channel(void); |
@@ -1507,7 +1507,7 @@ void viafb_fill_crtc_timing(const struct fb_var_screeninfo *var, | |||
1507 | viafb_set_vclock(PICOS2KHZ(var->pixclock) * 1000, iga); | 1507 | viafb_set_vclock(PICOS2KHZ(var->pixclock) * 1000, iga); |
1508 | } | 1508 | } |
1509 | 1509 | ||
1510 | void __devinit viafb_init_chip_info(int chip_type) | 1510 | void viafb_init_chip_info(int chip_type) |
1511 | { | 1511 | { |
1512 | via_clock_init(&clock, chip_type); | 1512 | via_clock_init(&clock, chip_type); |
1513 | init_gfx_chip_info(chip_type); | 1513 | init_gfx_chip_info(chip_type); |
@@ -1540,7 +1540,7 @@ void viafb_update_device_setting(int hres, int vres, int bpp, int flag) | |||
1540 | } | 1540 | } |
1541 | } | 1541 | } |
1542 | 1542 | ||
1543 | static void __devinit init_gfx_chip_info(int chip_type) | 1543 | static void init_gfx_chip_info(int chip_type) |
1544 | { | 1544 | { |
1545 | u8 tmp; | 1545 | u8 tmp; |
1546 | 1546 | ||
@@ -1593,7 +1593,7 @@ static void __devinit init_gfx_chip_info(int chip_type) | |||
1593 | } | 1593 | } |
1594 | } | 1594 | } |
1595 | 1595 | ||
1596 | static void __devinit init_tmds_chip_info(void) | 1596 | static void init_tmds_chip_info(void) |
1597 | { | 1597 | { |
1598 | viafb_tmds_trasmitter_identify(); | 1598 | viafb_tmds_trasmitter_identify(); |
1599 | 1599 | ||
@@ -1638,7 +1638,7 @@ static void __devinit init_tmds_chip_info(void) | |||
1638 | &viaparinfo->shared->tmds_setting_info); | 1638 | &viaparinfo->shared->tmds_setting_info); |
1639 | } | 1639 | } |
1640 | 1640 | ||
1641 | static void __devinit init_lvds_chip_info(void) | 1641 | static void init_lvds_chip_info(void) |
1642 | { | 1642 | { |
1643 | viafb_lvds_trasmitter_identify(); | 1643 | viafb_lvds_trasmitter_identify(); |
1644 | viafb_init_lcd_size(); | 1644 | viafb_init_lcd_size(); |
@@ -1672,7 +1672,7 @@ static void __devinit init_lvds_chip_info(void) | |||
1672 | viaparinfo->chip_info->lvds_chip_info.output_interface); | 1672 | viaparinfo->chip_info->lvds_chip_info.output_interface); |
1673 | } | 1673 | } |
1674 | 1674 | ||
1675 | void __devinit viafb_init_dac(int set_iga) | 1675 | void viafb_init_dac(int set_iga) |
1676 | { | 1676 | { |
1677 | int i; | 1677 | int i; |
1678 | u8 tmp; | 1678 | u8 tmp; |