diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-09-06 10:23:58 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-09-06 10:23:58 -0700 |
| commit | eeea3ac912207dcf759b95b2b4c36f96bce583bf (patch) | |
| tree | 471f5aa376928c949bfb13570b208bd9ec9b87bf /arch/arm/mach-shmobile/board-marzen.c | |
| parent | c7c6bf1e8c72b94d73756d5dc4f7a6d7c4d1e290 (diff) | |
| parent | e829c66745e66558b624fd635be4a384fe854944 (diff) | |
| download | linux-3.10-eeea3ac912207dcf759b95b2b4c36f96bce583bf.tar.gz linux-3.10-eeea3ac912207dcf759b95b2b4c36f96bce583bf.tar.bz2 linux-3.10-eeea3ac912207dcf759b95b2b4c36f96bce583bf.zip | |
Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull ARM SoC bug fixes from Olof Johansson:
"Mostly Renesas and Atmel bugfixes this time, targeting boot and build
problems. A couple of patches for gemini and kirkwood as well. On a
whole nothing very controversial."
* tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
ARM: gemini: fix the gemini build
ARM: shmobile: armadillo800eva: enable rw rootfs mount
ARM: Kirkwood: Fix 'SZ_1M' undeclared here for db88f6281-bp-setup.c
ARM: shmobile: mackerel: fixup usb module order
ARM: shmobile: armadillo800eva: fixup: sound card detection order
ARM: shmobile: marzen: fixup smsc911x id for regulator
ARM: at91/feature-removal-schedule: delay at91_mci removal
ARM: mach-shmobile: armadillo800eva: Enable power button as wakeup source
ARM: mach-shmobile: armadillo800eva: Fix GPIO buttons descriptions
ARM: at91/dts: remove partial parameter in at91sam9g25ek.dts
ARM: at91/clock: fix PLLA overclock warning
ARM: at91: fix rtc-at91sam9 irq issue due to sparse irq support
ARM: at91: fix system timer irq issue due to sparse irq support
ARM: shmobile: sh73a0: fixup RELOC_BASE of intca_irq_pins_desc
Diffstat (limited to 'arch/arm/mach-shmobile/board-marzen.c')
| -rw-r--r-- | arch/arm/mach-shmobile/board-marzen.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-shmobile/board-marzen.c b/arch/arm/mach-shmobile/board-marzen.c index 3a528cf4366..fcf5a47f477 100644 --- a/arch/arm/mach-shmobile/board-marzen.c +++ b/arch/arm/mach-shmobile/board-marzen.c @@ -67,7 +67,7 @@ static struct smsc911x_platform_config smsc911x_platdata = { static struct platform_device eth_device = { .name = "smsc911x", - .id = 0, + .id = -1, .dev = { .platform_data = &smsc911x_platdata, }, |