tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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>

authored by

Wolfram Sang and committed by
Jean Delvare 35bfc353 3b5f794b

+23 -23
+20 -20
drivers/i2c/busses/Kconfig
··· 475 475 help 476 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 498 config I2C_PNX 479 499 tristate "I2C bus support for Philips PNX targets" 480 500 depends on ARCH_PNX4008 ··· 730 710 system which doesn't have this device will result in long 731 711 delays when I2C/SMBus chip drivers are loaded (e.g. at boot 732 712 time). If unsure, say N. 733 - 734 - config I2C_PCA_PLATFORM 735 - tristate "PCA9564/PCA9665 as platform device" 736 - select I2C_ALGOPCA 737 - default n 738 - help 739 - This driver supports a memory mapped Philips PCA9564/PCA9665 740 - parallel bus to I2C bus controller. 741 - 742 - This driver can also be built as a module. If so, the module 743 - will be called i2c-pca-platform. 744 - 745 - config I2C_PMCMSP 746 - tristate "PMC MSP I2C TWI Controller" 747 - depends on PMC_MSP 748 - help 749 - This driver supports the PMC TWI controller on MSP devices. 750 - 751 - This driver can also be built as module. If so, the module 752 - will be called i2c-pmcmsp. 753 713 754 714 config I2C_SIBYTE 755 715 tristate "SiByte SMBus interface"
+3 -3
drivers/i2c/busses/Makefile
··· 27 27 obj-$(CONFIG_I2C_HYDRA) += i2c-hydra.o 28 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 31 obj-$(CONFIG_I2C_AT91) += i2c-at91.o 32 32 obj-$(CONFIG_I2C_AU1550) += i2c-au1550.o 33 33 obj-$(CONFIG_I2C_BLACKFIN_TWI) += i2c-bfin-twi.o ··· 46 46 obj-$(CONFIG_I2C_OCORES) += i2c-ocores.o 47 47 obj-$(CONFIG_I2C_OMAP) += i2c-omap.o 48 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 51 obj-$(CONFIG_I2C_PNX) += i2c-pnx.o 50 52 obj-$(CONFIG_I2C_PXA) += i2c-pxa.o 51 53 obj-$(CONFIG_I2C_S3C2410) += i2c-s3c2410.o ··· 70 68 obj-$(CONFIG_I2C_ACORN) += i2c-acorn.o 71 69 obj-$(CONFIG_I2C_ELEKTOR) += i2c-elektor.o 72 70 obj-$(CONFIG_I2C_PCA_ISA) += i2c-pca-isa.o 73 - obj-$(CONFIG_I2C_PCA_PLATFORM) += i2c-pca-platform.o 74 - obj-$(CONFIG_I2C_PMCMSP) += i2c-pmcmsp.o 75 71 obj-$(CONFIG_I2C_SIBYTE) += i2c-sibyte.o 76 72 obj-$(CONFIG_I2C_STUB) += i2c-stub.o 77 73 obj-$(CONFIG_SCx200_ACB) += scx200_acb.o