diff options
| author | Dmitry Torokhov <dtor_core@ameritech.net> | 2005-06-01 03:37:23 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dtor_core@ameritech.net> | 2005-06-01 03:37:23 -0400 |
| commit | 9d5432979951c8761c2b4517007039b9bcc1c110 (patch) | |
| tree | 9441cb1cd4a7674a2292936bfb42514f33d24cd4 /drivers/video/intelfb/intelfbdrv.c | |
| parent | a913829e90e2af7a6e98f5aadcc9fec4dcf1ef64 (diff) | |
| parent | 21e3024cbddb712f6a078bf4132d7682d3c4e35e (diff) | |
Automatic merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/video/intelfb/intelfbdrv.c')
| -rw-r--r-- | drivers/video/intelfb/intelfbdrv.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/drivers/video/intelfb/intelfbdrv.c b/drivers/video/intelfb/intelfbdrv.c index 549e22939260..25f9a9a65c24 100644 --- a/drivers/video/intelfb/intelfbdrv.c +++ b/drivers/video/intelfb/intelfbdrv.c | |||
| @@ -228,17 +228,17 @@ MODULE_DESCRIPTION( | |||
| 228 | MODULE_LICENSE("Dual BSD/GPL"); | 228 | MODULE_LICENSE("Dual BSD/GPL"); |
| 229 | MODULE_DEVICE_TABLE(pci, intelfb_pci_table); | 229 | MODULE_DEVICE_TABLE(pci, intelfb_pci_table); |
| 230 | 230 | ||
| 231 | static int accel __initdata = 1; | 231 | static int accel = 1; |
| 232 | static int vram __initdata = 4; | 232 | static int vram = 4; |
| 233 | static int hwcursor __initdata = 1; | 233 | static int hwcursor = 1; |
| 234 | static int mtrr __initdata = 1; | 234 | static int mtrr = 1; |
| 235 | static int fixed __initdata = 0; | 235 | static int fixed = 0; |
| 236 | static int noinit __initdata = 0; | 236 | static int noinit = 0; |
| 237 | static int noregister __initdata = 0; | 237 | static int noregister = 0; |
| 238 | static int probeonly __initdata = 0; | 238 | static int probeonly = 0; |
| 239 | static int idonly __initdata = 0; | 239 | static int idonly = 0; |
| 240 | static int bailearly __initdata = 0; | 240 | static int bailearly = 0; |
| 241 | static char *mode __initdata = NULL; | 241 | static char *mode = NULL; |
| 242 | 242 | ||
| 243 | module_param(accel, bool, S_IRUGO); | 243 | module_param(accel, bool, S_IRUGO); |
| 244 | MODULE_PARM_DESC(accel, "Enable console acceleration"); | 244 | MODULE_PARM_DESC(accel, "Enable console acceleration"); |