diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-08-27 17:14:13 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-08-27 17:14:13 +0200 |
| commit | 727dd67821e4581e4b61b30b79ca47c5bffc8497 (patch) | |
| tree | d5be61f067a42b2633ef148f416f138e7c2f7da2 /target/linux/config | |
| parent | 683cf71a6ebccbd4f827ad4a6ac92dbbaf8f644d (diff) | |
| parent | 008d0e157538e4a4c302dc79e6c28c9da615b527 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'target/linux/config')
| -rw-r--r-- | target/linux/config/Config.in.block | 2 | ||||
| -rw-r--r-- | target/linux/config/Config.in.cpu | 1 | ||||
| -rw-r--r-- | target/linux/config/Config.in.i2c | 1 |
3 files changed, 3 insertions, 1 deletions
diff --git a/target/linux/config/Config.in.block b/target/linux/config/Config.in.block index 63d8a03db..46d1fa684 100644 --- a/target/linux/config/Config.in.block +++ b/target/linux/config/Config.in.block @@ -170,7 +170,7 @@ config ADK_KERNEL_ATA_PIIX default y if ADK_TARGET_SYSTEM_IBM_X40 default n help - ATA PIXX driver + ATA PIIX driver. config ADK_KERNEL_PATA_MACIO prompt "MAC IO support" diff --git a/target/linux/config/Config.in.cpu b/target/linux/config/Config.in.cpu index 5bfa6d6c1..1f158a27c 100644 --- a/target/linux/config/Config.in.cpu +++ b/target/linux/config/Config.in.cpu @@ -53,6 +53,7 @@ config ADK_KERNEL_ARM_IMX6_CPUFREQ select ADK_KERNEL_REGULATOR select ADK_KERNEL_REGULATOR_FIXED_VOLTAGE select ADK_KERNEL_REGULATOR_ANATOP + select ADK_KERNEL_REGULATOR_PFUZE100 depends on ADK_TARGET_SYSTEM_SOLIDRUN_IMX6 default y if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6 default n diff --git a/target/linux/config/Config.in.i2c b/target/linux/config/Config.in.i2c index e7cbc24f2..bc4da73f6 100644 --- a/target/linux/config/Config.in.i2c +++ b/target/linux/config/Config.in.i2c @@ -12,6 +12,7 @@ config ADK_KERNEL_I2C_IMX tristate depends on ADK_TARGET_SYSTEM_SOLIDRUN_IMX6 select ADK_KERNEL_I2C + select ADK_KERNEL_REGMAP_I2C select ADK_KERNEL_I2C_CHARDEV default y if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6 default n |