Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp

Conflicts:
	litmus/sched_cedf.c

1 files changed, 18 insertions, 0 deletions

diff --git a/drivers/gpu/stub/Kconfig b/drivers/gpu/stub/Kconfig
new file mode 100644
index 000000000000..419917955bf6
--- /dev/null
+++ b/drivers/gpu/stub/Kconfig
@@ -0,0 +1,18 @@
+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.