diff options
| -rw-r--r-- | drivers/gpu/Makefile | 2 | ||||
| -rw-r--r-- | drivers/gpu/stub/Kconfig | 18 | ||||
| -rw-r--r-- | drivers/gpu/stub/Makefile | 1 | ||||
| -rw-r--r-- | drivers/gpu/stub/poulsbo.c | 64 | ||||
| -rw-r--r-- | drivers/video/Kconfig | 2 |
5 files changed, 1 insertions, 86 deletions
diff --git a/drivers/gpu/Makefile b/drivers/gpu/Makefile index cc9277885dd0..30879df3daea 100644 --- a/drivers/gpu/Makefile +++ b/drivers/gpu/Makefile @@ -1 +1 @@ -obj-y += drm/ vga/ stub/ +obj-y += drm/ vga/ diff --git a/drivers/gpu/stub/Kconfig b/drivers/gpu/stub/Kconfig deleted file mode 100644 index 419917955bf6..000000000000 --- a/drivers/gpu/stub/Kconfig +++ /dev/null @@ -1,18 +0,0 @@ -config STUB_POULSBO - tristate "Intel GMA500 Stub Driver" - depends on PCI - depends on NET # for THERMAL - # Poulsbo stub depends on ACPI_VIDEO when ACPI is enabled - # but for select to work, need to select ACPI_VIDEO's dependencies, ick - select BACKLIGHT_CLASS_DEVICE if ACPI - select VIDEO_OUTPUT_CONTROL if ACPI - select INPUT if ACPI - select ACPI_VIDEO if ACPI - select THERMAL if ACPI - help - Choose this option if you have a system that has Intel GMA500 - (Poulsbo) integrated graphics. If M is selected, the module will - be called Poulsbo. This driver is a stub driver for Poulsbo that - will call poulsbo.ko to enable the acpi backlight control sysfs - entry file because there have no poulsbo native driver can support - intel opregion. diff --git a/drivers/gpu/stub/Makefile b/drivers/gpu/stub/Makefile deleted file mode 100644 index cd940cc9d36d..000000000000 --- a/drivers/gpu/stub/Makefile +++ /dev/null @@ -1 +0,0 @@ -obj-$(CONFIG_STUB_POULSBO) += poulsbo.o diff --git a/drivers/gpu/stub/poulsbo.c b/drivers/gpu/stub/poulsbo.c deleted file mode 100644 index 7edfd27b8dee..000000000000 --- a/drivers/gpu/stub/poulsbo.c +++ /dev/null @@ -1,64 +0,0 @@ -/* - * Intel Poulsbo Stub driver - * - * Copyright (C) 2010 Novell <jlee@novell.com> - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 as published by - * the Free Software Foundation. - * - */ - -#include <linux/module.h> -#include <linux/pci.h> -#include <linux/acpi.h> -#include <acpi/video.h> - -#define DRIVER_NAME "poulsbo" - -enum { - CHIP_PSB_8108 = 0, - CHIP_PSB_8109 = 1, -}; - -static DEFINE_PCI_DEVICE_TABLE(pciidlist) = { - {0x8086, 0x8108, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_PSB_8108}, \ - {0x8086, 0x8109, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_PSB_8109}, \ - {0, 0, 0} -}; - -static int poulsbo_probe(struct pci_dev *pdev, const struct pci_device_id *id) -{ - return acpi_video_register(); -} - -static void poulsbo_remove(struct pci_dev *pdev) -{ - acpi_video_unregister(); -} - -static struct pci_driver poulsbo_driver = { - .name = DRIVER_NAME, - .id_table = pciidlist, - .probe = poulsbo_probe, - .remove = poulsbo_remove, -}; - -static int __init poulsbo_init(void) -{ - return pci_register_driver(&poulsbo_driver); -} - -static void __exit poulsbo_exit(void) -{ - pci_unregister_driver(&poulsbo_driver); -} - -module_init(poulsbo_init); -module_exit(poulsbo_exit); - -MODULE_AUTHOR("Lee, Chun-Yi <jlee@novell.com>"); -MODULE_DESCRIPTION("Poulsbo Stub Driver"); -MODULE_LICENSE("GPL"); - -MODULE_DEVICE_TABLE(pci, pciidlist); diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig index 807c7fa689fa..09f1a18c1adf 100644 --- a/drivers/video/Kconfig +++ b/drivers/video/Kconfig @@ -21,8 +21,6 @@ source "drivers/gpu/vga/Kconfig" source "drivers/gpu/drm/Kconfig" -source "drivers/gpu/stub/Kconfig" - config VGASTATE tristate default n |