diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2013-01-29 04:48:30 -0500 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2013-01-29 04:48:30 -0500 |
| commit | 617677295b53a40d0e54aac4cbbc216ffbc755dd (patch) | |
| tree | 51b9e87213243ed5efff252c8e8d8fec4eebc588 /drivers/of/Kconfig | |
| parent | 5c8d1b68e01a144813e38795fe6dbe7ebb506131 (diff) | |
| parent | 6abb7c25775b7fb2225ad0508236d63ca710e65f (diff) | |
Merge branch 'master' into for-next
Conflicts:
drivers/devfreq/exynos4_bus.c
Sync with Linus' tree to be able to apply patches that are
against newer code (mvneta).
Diffstat (limited to 'drivers/of/Kconfig')
| -rw-r--r-- | drivers/of/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/of/Kconfig b/drivers/of/Kconfig index dfba3e64d595..d37bfcf5a3a2 100644 --- a/drivers/of/Kconfig +++ b/drivers/of/Kconfig | |||
| @@ -53,7 +53,7 @@ config OF_DEVICE | |||
| 53 | 53 | ||
| 54 | config OF_I2C | 54 | config OF_I2C |
| 55 | def_tristate I2C | 55 | def_tristate I2C |
| 56 | depends on I2C && !SPARC | 56 | depends on I2C |
| 57 | help | 57 | help |
| 58 | OpenFirmware I2C accessors | 58 | OpenFirmware I2C accessors |
| 59 | 59 | ||