diff options
author | Philippe Langlais <philippe.langlais@stericsson.com> | 2012-04-06 11:11:35 +0200 |
---|---|---|
committer | Philippe Langlais <philippe.langlais@stericsson.com> | 2012-04-06 11:11:35 +0200 |
commit | fc654dbbce5d9fc60c400de301476691f2bace44 (patch) | |
tree | 1dbfd49c53cfd2622ae4cda590614dcf5c4717c8 /drivers/Makefile | |
parent | e1076f2b6e3e1a8631060238f32c5deb2e37b655 (diff) | |
parent | 6a0d2186fd8891be6595c6d61ce960e12040816e (diff) |
Merge topic branch 'hsi' into integration-linux-ux500-3.3
Diffstat (limited to 'drivers/Makefile')
-rw-r--r-- | drivers/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/Makefile b/drivers/Makefile index 42edc9ef222..944c0b615e8 100644 --- a/drivers/Makefile +++ b/drivers/Makefile @@ -53,6 +53,7 @@ obj-$(CONFIG_ATA) += ata/ obj-$(CONFIG_TARGET_CORE) += target/ obj-$(CONFIG_MTD) += mtd/ obj-$(CONFIG_SPI) += spi/ +obj-y += hsi/ obj-y += net/ obj-$(CONFIG_ATM) += atm/ obj-$(CONFIG_FUSION) += message/ |