diff options
| author | David S. Miller <davem@davemloft.net> | 2011-07-14 10:56:40 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-07-14 10:56:40 -0400 |
| commit | 6a7ebdf2fd15417e87b4fd02ff411aeaca34da5f (patch) | |
| tree | 86b15d8cd3e25c97b348b5a61bdb16c02726a480 /drivers/mfd/Makefile | |
| parent | f6b72b6217f8c24f2a54988e58af858b4e66024d (diff) | |
| parent | 51414d41084496aaefd06d7f19eb8206e8bfac2d (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
net/bluetooth/l2cap_core.c
Diffstat (limited to 'drivers/mfd/Makefile')
| -rw-r--r-- | drivers/mfd/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/mfd/Makefile b/drivers/mfd/Makefile index efe3cc33ed92..d7d47d2a4c76 100644 --- a/drivers/mfd/Makefile +++ b/drivers/mfd/Makefile | |||
| @@ -94,3 +94,4 @@ obj-$(CONFIG_MFD_OMAP_USB_HOST) += omap-usb-host.o | |||
| 94 | obj-$(CONFIG_MFD_PM8921_CORE) += pm8921-core.o | 94 | obj-$(CONFIG_MFD_PM8921_CORE) += pm8921-core.o |
| 95 | obj-$(CONFIG_MFD_PM8XXX_IRQ) += pm8xxx-irq.o | 95 | obj-$(CONFIG_MFD_PM8XXX_IRQ) += pm8xxx-irq.o |
| 96 | obj-$(CONFIG_MFD_TPS65910) += tps65910.o tps65910-irq.o | 96 | obj-$(CONFIG_MFD_TPS65910) += tps65910.o tps65910-irq.o |
| 97 | obj-$(CONFIG_TPS65911_COMPARATOR) += tps65911-comparator.o | ||