diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2012-05-30 21:11:26 +0200 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2012-05-30 21:11:32 +0200 |
| commit | bbd771474ec44b516107685d77e1c80bbe09f141 (patch) | |
| tree | 0cb15781539a68f27b4ea6c89f827282630cbce6 /drivers/i2c/busses/i2c-pxa.c | |
| parent | Merge branch 'x86/mce' into x86/urgent (diff) | |
| parent | x86, realmode: Unbreak the ia64 build of drivers/acpi/sleep.c (diff) | |
| download | linux-bbd771474ec44b516107685d77e1c80bbe09f141.tar.xz linux-bbd771474ec44b516107685d77e1c80bbe09f141.zip | |
Merge branch 'x86/trampoline' into x86/urgent
x86/trampoline contains an urgent commit which is necessarily on a
newer baseline.
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'drivers/i2c/busses/i2c-pxa.c')
| -rw-r--r-- | drivers/i2c/busses/i2c-pxa.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/i2c/busses/i2c-pxa.c b/drivers/i2c/busses/i2c-pxa.c index f6733267fa9c..a997c7d3f95d 100644 --- a/drivers/i2c/busses/i2c-pxa.c +++ b/drivers/i2c/busses/i2c-pxa.c @@ -1131,11 +1131,6 @@ static int i2c_pxa_probe(struct platform_device *dev) spin_lock_init(&i2c->lock); init_waitqueue_head(&i2c->wait); - /* - * If "dev->id" is negative we consider it as zero. - * The reason to do so is to avoid sysfs names that only make - * sense when there are multiple adapters. - */ i2c->adap.nr = dev->id; snprintf(i2c->adap.name, sizeof(i2c->adap.name), "pxa_i2c-i2c.%u", i2c->adap.nr); |