diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-06-16 05:24:00 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-06-16 05:24:00 -0400 |
| commit | 6d72b7952fa7d7c61d021398970c29afde6a4443 (patch) | |
| tree | 31c00be8e2837e2db2e62c694421a93a9f4c79d7 /drivers/video/cirrusfb.c | |
| parent | 6360b1fbb4a939efd34fc770c2ebd927c55506e0 (diff) | |
| parent | 066519068ad2fbe98c7f45552b1f592903a9c8c8 (diff) | |
Merge branch 'linus' into core/rodata
Diffstat (limited to 'drivers/video/cirrusfb.c')
| -rw-r--r-- | drivers/video/cirrusfb.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/video/cirrusfb.c b/drivers/video/cirrusfb.c index 35ac9d956b3d..c14b2435d23e 100644 --- a/drivers/video/cirrusfb.c +++ b/drivers/video/cirrusfb.c | |||
| @@ -2432,9 +2432,9 @@ static int cirrusfb_pci_register(struct pci_dev *pdev, | |||
| 2432 | info->screen_size = board_size; | 2432 | info->screen_size = board_size; |
| 2433 | cinfo->unmap = cirrusfb_pci_unmap; | 2433 | cinfo->unmap = cirrusfb_pci_unmap; |
| 2434 | 2434 | ||
| 2435 | printk(KERN_INFO " RAM (%lu kB) at 0xx%lx, ", | 2435 | printk(KERN_INFO "RAM (%lu kB) at 0x%lx, Cirrus " |
| 2436 | info->screen_size >> 10, board_addr); | 2436 | "Logic chipset on PCI bus\n", |
| 2437 | printk(KERN_INFO "Cirrus Logic chipset on PCI bus\n"); | 2437 | info->screen_size >> 10, board_addr); |
| 2438 | pci_set_drvdata(pdev, info); | 2438 | pci_set_drvdata(pdev, info); |
| 2439 | 2439 | ||
| 2440 | ret = cirrusfb_register(info); | 2440 | ret = cirrusfb_register(info); |