Merge git://git.infradead.org/mtd-2.6

[linux-2.6] / drivers / video / backlight / progear_bl.c

diff --git a/drivers/video/backlight/progear_bl.c b/drivers/video/backlight/progear_bl.c
index 702269357861c71c9c8d773bc9a25669db236e40..15fb4d58b5bcce35f4e8c0a9a00bd0d76246370e 100644 (file)
--- a/drivers/video/backlight/progear_bl.c
+++ b/drivers/video/backlight/progear_bl.c
@@ -23,7 +23,6 @@
 #include <linux/fb.h>
 #include <linux/backlight.h>
 #include <linux/pci.h>
-#include <asm/uaccess.h>
 
 #define PMU_LPCR               0xB0
 #define SB_MPS1                0x61
@@ -65,13 +64,13 @@ static int progearbl_probe(struct platform_device *pdev)
        u8 temp;
        struct backlight_device *progear_backlight_device;
 
-       pmu_dev = pci_get_device(PCI_VENDOR_ID_AL, PCI_DEVICE_ID_AL_M7101, 0);
+       pmu_dev = pci_get_device(PCI_VENDOR_ID_AL, PCI_DEVICE_ID_AL_M7101, NULL);
        if (!pmu_dev) {
                printk("ALI M7101 PMU not found.\n");
                return -ENODEV;
        }
 
-       sb_dev = pci_get_device(PCI_VENDOR_ID_AL, PCI_DEVICE_ID_AL_M1533, 0);
+       sb_dev = pci_get_device(PCI_VENDOR_ID_AL, PCI_DEVICE_ID_AL_M1533, NULL);
        if (!sb_dev) {
                printk("ALI 1533 SB not found.\n");
                pci_dev_put(pmu_dev);