projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'dt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
[firefly-linux-kernel-4.4.55.git]
/
arch
/
arm
/
plat-samsung
/
devs.c
diff --git
a/arch/arm/plat-samsung/devs.c
b/arch/arm/plat-samsung/devs.c
index 52dfa8f914c7384e7ddaabb99b0a14cde456beb2..bc50b20a8ffc5163f699304eb58dabedf3d82578 100644
(file)
--- a/
arch/arm/plat-samsung/devs.c
+++ b/
arch/arm/plat-samsung/devs.c
@@
-486,11
+486,7
@@
static struct resource s3c_i2c0_resource[] = {
struct platform_device s3c_device_i2c0 = {
.name = "s3c2410-i2c",
-#ifdef CONFIG_S3C_DEV_I2C1
.id = 0,
-#else
- .id = -1,
-#endif
.num_resources = ARRAY_SIZE(s3c_i2c0_resource),
.resource = s3c_i2c0_resource,
};