diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2011-09-07 23:18:36 +0200 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2011-09-07 23:18:36 +0200 |
| commit | 7e66eaf14e19c032433be7c4df3c892fa2a5282f (patch) | |
| tree | 56b0d5f9d16eb18744e102f3f216715196cd62e6 /drivers/Makefile | |
| parent | Input: tsc2007 - add open and close methods (diff) | |
| parent | Linux 3.1-rc4 (diff) | |
| download | linux-7e66eaf14e19c032433be7c4df3c892fa2a5282f.tar.xz linux-7e66eaf14e19c032433be7c4df3c892fa2a5282f.zip | |
Merge commit 'v3.1-rc4' into next
Diffstat (limited to 'drivers/Makefile')
| -rw-r--r-- | drivers/Makefile | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/Makefile b/drivers/Makefile index 09f3232bcdcd..7fa433a7030c 100644 --- a/drivers/Makefile +++ b/drivers/Makefile @@ -122,3 +122,8 @@ obj-y += ieee802154/ obj-y += clk/ obj-$(CONFIG_HWSPINLOCK) += hwspinlock/ +obj-$(CONFIG_NFC) += nfc/ +obj-$(CONFIG_IOMMU_SUPPORT) += iommu/ + +# Virtualization drivers +obj-$(CONFIG_VIRT_DRIVERS) += virt/ |