diff options
author | Len Brown <len.brown@intel.com> | 2009-01-09 04:01:26 -0500 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2009-01-09 04:56:56 -0500 |
commit | d97c0defba25a959a990f6d4759f43075540832e (patch) | |
tree | 27dceaf310e01a6bbcceee3550112b19202f142f /drivers/platform/Kconfig | |
parent | ec9f168fcc344d2ffec1c8c822076bf22dab5c33 (diff) | |
parent | b4f9fe12157a33351d0df78e925dcacd13252783 (diff) |
Merge branch 'drivers-platform' into release
Conflicts:
drivers/misc/Kconfig
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/platform/Kconfig')
-rw-r--r-- | drivers/platform/Kconfig | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/platform/Kconfig b/drivers/platform/Kconfig new file mode 100644 index 000000000000..9652c3fe7f5e --- /dev/null +++ b/drivers/platform/Kconfig | |||
@@ -0,0 +1,5 @@ | |||
1 | # drivers/platform/Kconfig | ||
2 | |||
3 | if X86 | ||
4 | source "drivers/platform/x86/Kconfig" | ||
5 | endif | ||