diff options
author | Paul Mundt <lethal@linux-sh.org> | 2011-05-23 02:35:33 (GMT) |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2011-05-23 02:35:33 (GMT) |
commit | 8ace5c4698ec8da53e69095596718d5a936433de (patch) | |
tree | 1f5959b3ac289e3bde420cc14109be0cc518a75a /drivers/firmware/Kconfig | |
parent | a375b15164dd9264f724ad941825e52c90145151 (diff) | |
parent | 71a8638480eb8fb6cfabe2ee9ca3fbc6e3453a14 (diff) | |
download | linux-8ace5c4698ec8da53e69095596718d5a936433de.tar.xz |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into sh-latest
Diffstat (limited to 'drivers/firmware/Kconfig')
-rw-r--r-- | drivers/firmware/Kconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/firmware/Kconfig b/drivers/firmware/Kconfig index b3a25a5..efba163 100644 --- a/drivers/firmware/Kconfig +++ b/drivers/firmware/Kconfig @@ -157,4 +157,6 @@ config SIGMA If unsure, say N here. Drivers that need these helpers will select this option automatically. +source "drivers/firmware/google/Kconfig" + endmenu |