diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-07-15 11:38:17 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-07-15 11:38:17 +1000 |
| commit | 7805af74d3a68804b6fc36caadbe771a772ebd54 (patch) | |
| tree | 3061cc4dae8b733e83cf14800e5cc5d5ff4a4dad /drivers | |
| parent | af468af7b39b8cf788a8e59b674f6f1c67ef9c6f (diff) | |
| parent | ac3aa5375db246f0af98e519fab478523a6212ed (diff) | |
Merge remote branch 'viafb/viafb-next'
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/video/via/via-core.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/video/via/via-core.c b/drivers/video/via/via-core.c index e8cfe8392110..ec2e5aafb279 100644 --- a/drivers/video/via/via-core.c +++ b/drivers/video/via/via-core.c @@ -64,7 +64,7 @@ static inline int viafb_mmio_read(int reg) */ static u32 viafb_enabled_ints; -static void viafb_int_init(void) +static void __devinit viafb_int_init(void) { viafb_enabled_ints = 0; @@ -489,7 +489,7 @@ out_unmap: return ret; } -static void __devexit via_pci_teardown_mmio(struct viafb_dev *vdev) +static void via_pci_teardown_mmio(struct viafb_dev *vdev) { iounmap(vdev->fbmem); iounmap(vdev->engine_mmio); @@ -548,7 +548,7 @@ static int __devinit via_setup_subdevs(struct viafb_dev *vdev) return 0; } -static void __devexit via_teardown_subdevs(void) +static void via_teardown_subdevs(void) { int i; |