diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-03-28 21:24:50 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-03-28 21:24:50 -0500 |
| commit | bac30d1a78d0f11c613968fc8b351a91ed465386 (patch) | |
| tree | e52f3c876522a2f6047a6ec1c27df2e8a79486b8 /drivers/video/console/newport_con.c | |
| parent | e8222502ee6157e2713da9e0792c21f4ad458d50 (diff) | |
| parent | ca9ba4471c1203bb6e759b76e83167fec54fe590 (diff) | |
Merge ../linux-2.6
Diffstat (limited to 'drivers/video/console/newport_con.c')
| -rw-r--r-- | drivers/video/console/newport_con.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/video/console/newport_con.c b/drivers/video/console/newport_con.c index 762c7a593141..e99fe30e568c 100644 --- a/drivers/video/console/newport_con.c +++ b/drivers/video/console/newport_con.c | |||
| @@ -149,7 +149,7 @@ static inline void newport_clear_lines(int ystart, int yend, int ci) | |||
| 149 | newport_clear_screen(0, ystart, 1280 + 63, yend, ci); | 149 | newport_clear_screen(0, ystart, 1280 + 63, yend, ci); |
| 150 | } | 150 | } |
| 151 | 151 | ||
| 152 | void newport_reset(void) | 152 | static void newport_reset(void) |
| 153 | { | 153 | { |
| 154 | unsigned short treg; | 154 | unsigned short treg; |
| 155 | int i; | 155 | int i; |
| @@ -193,7 +193,7 @@ void newport_reset(void) | |||
| 193 | * calculate the actual screen size by reading | 193 | * calculate the actual screen size by reading |
| 194 | * the video timing out of the VC2 | 194 | * the video timing out of the VC2 |
| 195 | */ | 195 | */ |
| 196 | void newport_get_screensize(void) | 196 | static void newport_get_screensize(void) |
| 197 | { | 197 | { |
| 198 | int i, cols; | 198 | int i, cols; |
| 199 | unsigned short ventry, treg; | 199 | unsigned short ventry, treg; |