Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 252863
b: refs/heads/master
c: bb3ce20
h: refs/heads/master
i:
  252861: 9c20098
  252859: dd011b8
  252855: cd96933
  252847: 2c343d7
  252831: 9c4217c
  252799: fe87ed7
v: v3
  • Loading branch information
Yin Kangkai authored and Matthew Garrett committed May 27, 2011
1 parent 28cd26c commit 61da60d
Show file tree
Hide file tree
Showing 4 changed files with 407 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 0978e012cfbaca8bd312933e98cdea2d11778e11
refs/heads/master: bb3ce2020451bdebe5ceac770504f427724008a9
9 changes: 9 additions & 0 deletions trunk/drivers/platform/x86/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -760,4 +760,13 @@ config MXM_WMI
MXM is a standard for laptop graphics cards, the WMI interface
is required for switchable nvidia graphics machines

config INTEL_OAKTRAIL
tristate "Intel Oaktrail Platform Extras"
depends on ACPI
depends on RFKILL && BACKLIGHT_CLASS_DEVICE && ACPI
---help---
Intel Oaktrail platform need this driver to provide interfaces to
enable/disable the Camera, WiFi, BT etc. devices. If in doubt, say Y
here; it will only load on supported platforms.

endif # X86_PLATFORM_DEVICES
1 change: 1 addition & 0 deletions trunk/drivers/platform/x86/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -43,3 +43,4 @@ obj-$(CONFIG_IBM_RTL) += ibm_rtl.o
obj-$(CONFIG_SAMSUNG_LAPTOP) += samsung-laptop.o
obj-$(CONFIG_INTEL_MFLD_THERMAL) += intel_mid_thermal.o
obj-$(CONFIG_MXM_WMI) += mxm-wmi.o
obj-$(CONFIG_INTEL_OAKTRAIL) += intel_oaktrail.o
Loading

0 comments on commit 61da60d

Please sign in to comment.