diff options
| author | Len Brown <len.brown@intel.com> | 2009-12-16 13:57:16 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2009-12-16 13:57:16 -0500 |
| commit | 243e1ef842ef9e24fbf1cc7ddf4fd1c01471544a (patch) | |
| tree | af808f66a8a8518c82c0e8189df7ac0d4252f31b /drivers/platform/x86/Makefile | |
| parent | 7d8c22060555a51c23b9c6a76b97a5e75b5db882 (diff) | |
| parent | 42b4e9ee3d1d3b691bcae37f217f08740320c58c (diff) | |
| download | blackbird-op-linux-243e1ef842ef9e24fbf1cc7ddf4fd1c01471544a.tar.gz blackbird-op-linux-243e1ef842ef9e24fbf1cc7ddf4fd1c01471544a.zip | |
Merge branch 'toshiba-bt' into release
Diffstat (limited to 'drivers/platform/x86/Makefile')
| -rw-r--r-- | drivers/platform/x86/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/platform/x86/Makefile b/drivers/platform/x86/Makefile index 13aa37310f33..b7474b6a8bf1 100644 --- a/drivers/platform/x86/Makefile +++ b/drivers/platform/x86/Makefile @@ -22,3 +22,4 @@ obj-$(CONFIG_MSI_WMI) += msi-wmi.o obj-$(CONFIG_ACPI_ASUS) += asus_acpi.o obj-$(CONFIG_TOPSTAR_LAPTOP) += topstar-laptop.o obj-$(CONFIG_ACPI_TOSHIBA) += toshiba_acpi.o +obj-$(CONFIG_TOSHIBA_BT_RFKILL) += toshiba_bluetooth.o |
