diff options
author | Wolfram Sang <w.sang@pengutronix.de> | 2010-06-03 05:33:56 -0400 |
---|---|---|
committer | Jean Delvare <khali@linux-fr.org> | 2010-06-03 05:33:56 -0400 |
commit | 35bfc353dcaecc99c277e3646564f3f785760bde (patch) | |
tree | d1d2d96f4d51bddc2d6b5002fc2e52aa93195a22 /drivers | |
parent | 3b5f794b8b647409155cade4eac2825bc49b4a66 (diff) |
i2c/busses: Move two drivers to embedded section
And fix a typo while we are here
Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/i2c/busses/Kconfig | 40 | ||||
-rw-r--r-- | drivers/i2c/busses/Makefile | 6 |
2 files changed, 23 insertions, 23 deletions
diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig index 87ab0568bb0e..bceafbfa7268 100644 --- a/drivers/i2c/busses/Kconfig +++ b/drivers/i2c/busses/Kconfig | |||
@@ -475,6 +475,26 @@ config I2C_PASEMI | |||
475 | help | 475 | help |
476 | Supports the PA Semi PWRficient on-chip SMBus interfaces. | 476 | Supports the PA Semi PWRficient on-chip SMBus interfaces. |
477 | 477 | ||
478 | config I2C_PCA_PLATFORM | ||
479 | tristate "PCA9564/PCA9665 as platform device" | ||
480 | select I2C_ALGOPCA | ||
481 | default n | ||
482 | help | ||
483 | This driver supports a memory mapped Philips PCA9564/PCA9665 | ||
484 | parallel bus to I2C bus controller. | ||
485 | |||
486 | This driver can also be built as a module. If so, the module | ||
487 | will be called i2c-pca-platform. | ||
488 | |||
489 | config I2C_PMCMSP | ||
490 | tristate "PMC MSP I2C TWI Controller" | ||
491 | depends on PMC_MSP | ||
492 | help | ||
493 | This driver supports the PMC TWI controller on MSP devices. | ||
494 | |||
495 | This driver can also be built as module. If so, the module | ||
496 | will be called i2c-pmcmsp. | ||
497 | |||
478 | config I2C_PNX | 498 | config I2C_PNX |
479 | tristate "I2C bus support for Philips PNX targets" | 499 | tristate "I2C bus support for Philips PNX targets" |
480 | depends on ARCH_PNX4008 | 500 | depends on ARCH_PNX4008 |
@@ -711,26 +731,6 @@ config I2C_PCA_ISA | |||
711 | delays when I2C/SMBus chip drivers are loaded (e.g. at boot | 731 | delays when I2C/SMBus chip drivers are loaded (e.g. at boot |
712 | time). If unsure, say N. | 732 | time). If unsure, say N. |
713 | 733 | ||
714 | config I2C_PCA_PLATFORM | ||
715 | tristate "PCA9564/PCA9665 as platform device" | ||
716 | select I2C_ALGOPCA | ||
717 | default n | ||
718 | help | ||
719 | This driver supports a memory mapped Philips PCA9564/PCA9665 | ||
720 | parallel bus to I2C bus controller. | ||
721 | |||
722 | This driver can also be built as a module. If so, the module | ||
723 | will be called i2c-pca-platform. | ||
724 | |||
725 | config I2C_PMCMSP | ||
726 | tristate "PMC MSP I2C TWI Controller" | ||
727 | depends on PMC_MSP | ||
728 | help | ||
729 | This driver supports the PMC TWI controller on MSP devices. | ||
730 | |||
731 | This driver can also be built as module. If so, the module | ||
732 | will be called i2c-pmcmsp. | ||
733 | |||
734 | config I2C_SIBYTE | 734 | config I2C_SIBYTE |
735 | tristate "SiByte SMBus interface" | 735 | tristate "SiByte SMBus interface" |
736 | depends on SIBYTE_SB1xxx_SOC | 736 | depends on SIBYTE_SB1xxx_SOC |
diff --git a/drivers/i2c/busses/Makefile b/drivers/i2c/busses/Makefile index 097236f631e8..936880bd1dc5 100644 --- a/drivers/i2c/busses/Makefile +++ b/drivers/i2c/busses/Makefile | |||
@@ -27,7 +27,7 @@ obj-$(CONFIG_I2C_VIAPRO) += i2c-viapro.o | |||
27 | obj-$(CONFIG_I2C_HYDRA) += i2c-hydra.o | 27 | obj-$(CONFIG_I2C_HYDRA) += i2c-hydra.o |
28 | obj-$(CONFIG_I2C_POWERMAC) += i2c-powermac.o | 28 | obj-$(CONFIG_I2C_POWERMAC) += i2c-powermac.o |
29 | 29 | ||
30 | # Embebbed system I2C/SMBus host controller drivers | 30 | # Embedded system I2C/SMBus host controller drivers |
31 | obj-$(CONFIG_I2C_AT91) += i2c-at91.o | 31 | obj-$(CONFIG_I2C_AT91) += i2c-at91.o |
32 | obj-$(CONFIG_I2C_AU1550) += i2c-au1550.o | 32 | obj-$(CONFIG_I2C_AU1550) += i2c-au1550.o |
33 | obj-$(CONFIG_I2C_BLACKFIN_TWI) += i2c-bfin-twi.o | 33 | obj-$(CONFIG_I2C_BLACKFIN_TWI) += i2c-bfin-twi.o |
@@ -46,6 +46,8 @@ obj-$(CONFIG_I2C_NOMADIK) += i2c-nomadik.o | |||
46 | obj-$(CONFIG_I2C_OCORES) += i2c-ocores.o | 46 | obj-$(CONFIG_I2C_OCORES) += i2c-ocores.o |
47 | obj-$(CONFIG_I2C_OMAP) += i2c-omap.o | 47 | obj-$(CONFIG_I2C_OMAP) += i2c-omap.o |
48 | obj-$(CONFIG_I2C_PASEMI) += i2c-pasemi.o | 48 | obj-$(CONFIG_I2C_PASEMI) += i2c-pasemi.o |
49 | obj-$(CONFIG_I2C_PCA_PLATFORM) += i2c-pca-platform.o | ||
50 | obj-$(CONFIG_I2C_PMCMSP) += i2c-pmcmsp.o | ||
49 | obj-$(CONFIG_I2C_PNX) += i2c-pnx.o | 51 | obj-$(CONFIG_I2C_PNX) += i2c-pnx.o |
50 | obj-$(CONFIG_I2C_PXA) += i2c-pxa.o | 52 | obj-$(CONFIG_I2C_PXA) += i2c-pxa.o |
51 | obj-$(CONFIG_I2C_S3C2410) += i2c-s3c2410.o | 53 | obj-$(CONFIG_I2C_S3C2410) += i2c-s3c2410.o |
@@ -68,8 +70,6 @@ obj-$(CONFIG_I2C_TINY_USB) += i2c-tiny-usb.o | |||
68 | obj-$(CONFIG_I2C_ACORN) += i2c-acorn.o | 70 | obj-$(CONFIG_I2C_ACORN) += i2c-acorn.o |
69 | obj-$(CONFIG_I2C_ELEKTOR) += i2c-elektor.o | 71 | obj-$(CONFIG_I2C_ELEKTOR) += i2c-elektor.o |
70 | obj-$(CONFIG_I2C_PCA_ISA) += i2c-pca-isa.o | 72 | obj-$(CONFIG_I2C_PCA_ISA) += i2c-pca-isa.o |
71 | obj-$(CONFIG_I2C_PCA_PLATFORM) += i2c-pca-platform.o | ||
72 | obj-$(CONFIG_I2C_PMCMSP) += i2c-pmcmsp.o | ||
73 | obj-$(CONFIG_I2C_SIBYTE) += i2c-sibyte.o | 73 | obj-$(CONFIG_I2C_SIBYTE) += i2c-sibyte.o |
74 | obj-$(CONFIG_I2C_STUB) += i2c-stub.o | 74 | obj-$(CONFIG_I2C_STUB) += i2c-stub.o |
75 | obj-$(CONFIG_SCx200_ACB) += scx200_acb.o | 75 | obj-$(CONFIG_SCx200_ACB) += scx200_acb.o |