diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-08 15:43:09 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-08 15:43:09 -0700 |
| commit | c0d6f9663b30a09ed725229b2d50391268c8538e (patch) | |
| tree | 7ba471cf9632097682ab55689cd64c9a68e11235 /drivers/i2c/busses/Makefile | |
| parent | 0db7443b2bd0b92da4e8afa46f8123a7076136c6 (diff) | |
| parent | 6fd60fa97b706e52abba7c9f810b148aa230817f (diff) | |
| download | talos-obmc-linux-c0d6f9663b30a09ed725229b2d50391268c8538e.tar.gz talos-obmc-linux-c0d6f9663b30a09ed725229b2d50391268c8538e.zip | |
Merge master.kernel.org:/home/rmk/linux-2.6-i2c manually
Old tree, so the automatic merge had some problems.
Diffstat (limited to 'drivers/i2c/busses/Makefile')
| -rw-r--r-- | drivers/i2c/busses/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/i2c/busses/Makefile b/drivers/i2c/busses/Makefile index 42d6d814da72..980b3e983670 100644 --- a/drivers/i2c/busses/Makefile +++ b/drivers/i2c/busses/Makefile @@ -28,6 +28,7 @@ obj-$(CONFIG_I2C_PARPORT_LIGHT) += i2c-parport-light.o obj-$(CONFIG_I2C_PCA_ISA) += i2c-pca-isa.o obj-$(CONFIG_I2C_PIIX4) += i2c-piix4.o obj-$(CONFIG_I2C_PROSAVAGE) += i2c-prosavage.o +obj-$(CONFIG_I2C_PXA) += i2c-pxa.o obj-$(CONFIG_I2C_RPXLITE) += i2c-rpx.o obj-$(CONFIG_I2C_S3C2410) += i2c-s3c2410.o obj-$(CONFIG_I2C_SAVAGE4) += i2c-savage4.o |
