diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2012-11-16 14:00:34 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2012-11-16 14:00:34 +0100 |
| commit | daac8bf5d3bd5e157c66d753eac0d5efb47aa145 (patch) | |
| tree | d599de85cebf7ab3da97e0275dbf1b40399e1943 /drivers/Kconfig | |
| parent | 2f5cd8571912689900651a17297ee5e8ed2bb816 (diff) | |
| parent | 33f59d8a81b4f870239b79ef274609b964292f84 (diff) | |
| download | barebox-daac8bf5d3bd5e157c66d753eac0d5efb47aa145.tar.gz barebox-daac8bf5d3bd5e157c66d753eac0d5efb47aa145.tar.xz | |
Merge branch 'for-next/bcm2835'
Conflicts:
arch/arm/configs/versatilepb_defconfig
Diffstat (limited to 'drivers/Kconfig')
| -rw-r--r-- | drivers/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/Kconfig b/drivers/Kconfig index 945fe02327..f6446e8413 100644 --- a/drivers/Kconfig +++ b/drivers/Kconfig @@ -11,6 +11,7 @@ source "drivers/usb/Kconfig" source "drivers/video/Kconfig" source "drivers/mci/Kconfig" source "drivers/clk/Kconfig" +source "drivers/clocksource/Kconfig" source "drivers/mfd/Kconfig" source "drivers/misc/Kconfig" source "drivers/led/Kconfig" |