summaryrefslogtreecommitdiffstats
path: root/drivers/i2c/busses/Makefile
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2012-12-17 07:04:14 +0100
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2012-12-17 07:04:14 +0100
commit022573c275500e1a50889949f679d04b5446edf6 (patch)
tree766ab0e13fc38275466f8544d1bbf4982833cbff /drivers/i2c/busses/Makefile
parentInput: matrix-keymap - provide a proper module license (diff)
parentInput: walkera0701 - fix crash on startup (diff)
downloadlinux-022573c275500e1a50889949f679d04b5446edf6.tar.xz
linux-022573c275500e1a50889949f679d04b5446edf6.zip
Merge branch 'next' into for-linus
Prepare first set of updates for 3.8 merge window.
Diffstat (limited to 'drivers/i2c/busses/Makefile')
-rw-r--r--drivers/i2c/busses/Makefile1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/i2c/busses/Makefile b/drivers/i2c/busses/Makefile
index 2d33d62952c1..395b516ffa08 100644
--- a/drivers/i2c/busses/Makefile
+++ b/drivers/i2c/busses/Makefile
@@ -85,7 +85,6 @@ obj-$(CONFIG_I2C_ACORN) += i2c-acorn.o
obj-$(CONFIG_I2C_ELEKTOR) += i2c-elektor.o
obj-$(CONFIG_I2C_PCA_ISA) += i2c-pca-isa.o
obj-$(CONFIG_I2C_SIBYTE) += i2c-sibyte.o
-obj-$(CONFIG_I2C_STUB) += i2c-stub.o
obj-$(CONFIG_SCx200_ACB) += scx200_acb.o
obj-$(CONFIG_SCx200_I2C) += scx200_i2c.o