diff options
| author | John W. Linville <linville@tuxdriver.com> | 2006-08-02 14:15:21 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2006-08-02 14:15:21 -0400 |
| commit | ebf572b448757190027d8ee34e73deb989ec7b60 (patch) | |
| tree | 2320a92b1aed2c9475e291d75c92616af75e195a /drivers/video/console/mdacon.c | |
| parent | 48c86da1a211ef13bbfb1c8f2e35dda44a66b8a1 (diff) | |
| parent | 49b1e3ea19b1c95c2f012b8331ffb3b169e4c042 (diff) | |
Merge branch 'from-linus' into bcm43xx
Diffstat (limited to 'drivers/video/console/mdacon.c')
| -rw-r--r-- | drivers/video/console/mdacon.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/video/console/mdacon.c b/drivers/video/console/mdacon.c index 52ed12b12acc..eb4d03fa5391 100644 --- a/drivers/video/console/mdacon.c +++ b/drivers/video/console/mdacon.c | |||
| @@ -197,7 +197,7 @@ static int __init mdacon_setup(char *str) | |||
| 197 | __setup("mdacon=", mdacon_setup); | 197 | __setup("mdacon=", mdacon_setup); |
| 198 | #endif | 198 | #endif |
| 199 | 199 | ||
| 200 | static int __init mda_detect(void) | 200 | static int mda_detect(void) |
| 201 | { | 201 | { |
| 202 | int count=0; | 202 | int count=0; |
| 203 | u16 *p, p_save; | 203 | u16 *p, p_save; |
| @@ -282,7 +282,7 @@ static int __init mda_detect(void) | |||
| 282 | return 1; | 282 | return 1; |
| 283 | } | 283 | } |
| 284 | 284 | ||
| 285 | static void __init mda_initialize(void) | 285 | static void mda_initialize(void) |
| 286 | { | 286 | { |
| 287 | write_mda_b(97, 0x00); /* horizontal total */ | 287 | write_mda_b(97, 0x00); /* horizontal total */ |
| 288 | write_mda_b(80, 0x01); /* horizontal displayed */ | 288 | write_mda_b(80, 0x01); /* horizontal displayed */ |