← Back to branch summary

~ubuntu-branches/debian/wheezy/linux-2.6/wheezy

« back to all changes in this revision

Viewing changes to drivers/video/platinumfb.c

  • Committer: Bazaar Package Importer
  • Author(s): Ben Hutchings, Ben Hutchings, Aurelien Jarno, Martin Michlmayr
  • Date: 2011-04-06 13:53:30 UTC
  • mfrom: (43.1.5 sid)
  • Revision ID: james.westby@ubuntu.com-20110406135330-wjufxhd0tvn3zx4z
Tags: 2.6.38-3
http://bugs.debian.org/620124
http://bugs.debian.org/620284
http://bugs.debian.org/620204
[ Ben Hutchings ]
* [ppc64] Add to linux-tools package architectures (Closes: #620124)
* [amd64] Save cr4 to mmu_cr4_features at boot time (Closes: #620284)
* appletalk: Fix bugs introduced when removing use of BKL
* ALSA: Fix yet another race in disconnection
* cciss: Fix lost command issue
* ath9k: Fix kernel panic in AR2427
* ses: Avoid kernel panic when lun 0 is not mapped
* PCI/ACPI: Report ASPM support to BIOS if not disabled from command line

[ Aurelien Jarno ]
* rtlwifi: fix build when PCI is not enabled.

[ Martin Michlmayr ]
* rtlwifi: Eliminate udelay calls with too large values (Closes: #620204)

Show diffs side-by-side

added added

removed removed

Lines of Context:
drivers/video/platinumfb.c
24
24
#include <linux/errno.h>
25
25
#include <linux/string.h>
26
26
#include <linux/mm.h>
27
 
#include <linux/slab.h>
28
27
#include <linux/vmalloc.h>
29
28
#include <linux/delay.h>
30
29
#include <linux/interrupt.h>
534
533
#define invalidate_cache(addr)
535
534
#endif
536
535
 
537
 
static int __devinit platinumfb_probe(struct of_device* odev,
 
536
static int __devinit platinumfb_probe(struct platform_device* odev,
538
537
                                      const struct of_device_id *match)
539
538
{
540
 
        struct device_node      *dp = odev->node;
 
539
        struct device_node      *dp = odev->dev.of_node;
541
540
        struct fb_info          *info;
542
541
        struct fb_info_platinum *pinfo;
543
542
        volatile __u8           *fbuffer;
647
646
        return rc;
648
647
}
649
648
 
650
 
static int __devexit platinumfb_remove(struct of_device* odev)
 
649
static int __devexit platinumfb_remove(struct platform_device* odev)
651
650
{
652
651
        struct fb_info          *info = dev_get_drvdata(&odev->dev);
653
652
        struct fb_info_platinum *pinfo = info->par;
680
679
 
681
680
static struct of_platform_driver platinum_driver = 
682
681
{
683
 
        .name           = "platinumfb",
684
 
        .match_table    = platinumfb_match,
 
682
        .driver = {
 
683
                .name = "platinumfb",
 
684
                .owner = THIS_MODULE,
 
685
                .of_match_table = platinumfb_match,
 
686
        },
685
687
        .probe          = platinumfb_probe,
686
688
        .remove         = platinumfb_remove,
687
689
};