aboutsummaryrefslogtreecommitdiff
path: root/drivers/Makefile
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2008-10-20 23:06:15 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2008-10-20 23:06:15 +0100
commitd1a7fddf420b1f5a7d9a899b3388026084a67d33 (patch)
tree7044a8b9a1b6fadc7b027d4a82840c084b0c8012 /drivers/Makefile
parent778c4c821779bb7eef7f5a1eea4d15d05d976f8b (diff)
parentc0e1936338a11ea252d11370ff62e40db334f646 (diff)
Merge branch 'for-rmk' of git://git.marvell.com/orion into devel
Diffstat (limited to 'drivers/Makefile')
-rw-r--r--drivers/Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/Makefile b/drivers/Makefile
index 2735bde7347..46c8681a07f 100644
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -99,3 +99,4 @@ obj-$(CONFIG_OF) += of/
obj-$(CONFIG_SSB) += ssb/
obj-$(CONFIG_VIRTIO) += virtio/
obj-$(CONFIG_REGULATOR) += regulator/
+obj-$(CONFIG_STAGING) += staging/