diff options
| author | Len Brown <len.brown@intel.com> | 2008-10-22 23:57:26 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2008-10-23 00:11:07 -0400 |
| commit | 057316cc6a5b521b332a1d7ccc871cd60c904c74 (patch) | |
| tree | 4333e608da237c73ff69b10878025cca96dcb4c8 /drivers/Makefile | |
| parent | 3e2dab9a1c2deb03c311eb3f83466009147ed4d3 (diff) | |
| parent | 2515ddc6db8eb49a79f0fe5e67ff09ac7c81eab4 (diff) | |
Merge branch 'linus' into test
Conflicts:
MAINTAINERS
arch/x86/kernel/acpi/boot.c
arch/x86/kernel/acpi/sleep.c
drivers/acpi/Kconfig
drivers/pnp/Makefile
drivers/pnp/quirks.c
Signed-off-by: Len Brown <len.brown@intel.com>
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 f443a8a9d46e..a0a2e3b675d6 100644 --- a/drivers/Makefile +++ b/drivers/Makefile | |||
| @@ -100,3 +100,4 @@ obj-$(CONFIG_OF) += of/ | |||
| 100 | obj-$(CONFIG_SSB) += ssb/ | 100 | obj-$(CONFIG_SSB) += ssb/ |
| 101 | obj-$(CONFIG_VIRTIO) += virtio/ | 101 | obj-$(CONFIG_VIRTIO) += virtio/ |
| 102 | obj-$(CONFIG_REGULATOR) += regulator/ | 102 | obj-$(CONFIG_REGULATOR) += regulator/ |
| 103 | obj-$(CONFIG_STAGING) += staging/ | ||