diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-08-27 12:42:43 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-08-27 12:42:43 -0400 |
commit | 88ede8209efd01b4a557ddd588875544954e170a (patch) | |
tree | faa926f325a2c6c04a48793cf734502c8a078ea1 /drivers | |
parent | 96665822dc43957d4337509e138017dc1cb960b1 (diff) | |
parent | 23dd6d351a2f8157602e854e3a147a04cf7279a1 (diff) |
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus: (60 commits)
[MIPS] Fulong doesn't need ISA DMA.
[MIPS] IP27: intr_sconnect_level: don't disable interrupts.
[MIPS] IP27: startup_bridge_irq: connect interrupt.
[MIPS] IP27: shutdown_bridge_irq: don't free irq.
[MIPS] Sort out handling of ISA-less PCI systems.
[MIPS] Add __cmpdi2
[MIPS] HOTPLUG: Make register_pci_controller __devinit.
[MIPS] PCI: Remove __devinit attribute from pcibios_fixup_bus.
[MIPS] PCI: Remove __devinit attribute from pcibios_fixup_bus.
[MIPS] Delete duplicate inclusion of <linux/delay.h>.
[MIPS] Polish <asm/edac.h>.
[MIPS] IP22: Export sgi_gfxaddr for use by the Newport console driver.
[MIPS] Maintain si_code field properly for FP exceptions
[MIPS] SMTC: Fix duplicate status dumps on NMI
[MIPS] Unconditionally writeback and invalidate caches on kexec.
[PATCH] rtc: Make rtc-rs5c348 driver hotplug-aware
[MIPS] Fix gcc 3.3 warning.
[MIPS] Fix invalid semicolon after if statement
[MIPS] Update Cobalt defconfig
[MIPS] Update workpad_defconfig
...
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/char/lcd.c | 1 | ||||
-rw-r--r-- | drivers/rtc/rtc-rs5c348.c | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/drivers/char/lcd.c b/drivers/char/lcd.c index 1f0962616ee5..4fe9206f84de 100644 --- a/drivers/char/lcd.c +++ b/drivers/char/lcd.c | |||
@@ -25,7 +25,6 @@ | |||
25 | #include <asm/io.h> | 25 | #include <asm/io.h> |
26 | #include <asm/uaccess.h> | 26 | #include <asm/uaccess.h> |
27 | #include <asm/system.h> | 27 | #include <asm/system.h> |
28 | #include <linux/delay.h> | ||
29 | 28 | ||
30 | #include "lcd.h" | 29 | #include "lcd.h" |
31 | 30 | ||
diff --git a/drivers/rtc/rtc-rs5c348.c b/drivers/rtc/rtc-rs5c348.c index f50f3fc353cd..839462659afa 100644 --- a/drivers/rtc/rtc-rs5c348.c +++ b/drivers/rtc/rtc-rs5c348.c | |||
@@ -226,7 +226,7 @@ static int __devexit rs5c348_remove(struct spi_device *spi) | |||
226 | 226 | ||
227 | static struct spi_driver rs5c348_driver = { | 227 | static struct spi_driver rs5c348_driver = { |
228 | .driver = { | 228 | .driver = { |
229 | .name = "rs5c348", | 229 | .name = "rtc-rs5c348", |
230 | .bus = &spi_bus_type, | 230 | .bus = &spi_bus_type, |
231 | .owner = THIS_MODULE, | 231 | .owner = THIS_MODULE, |
232 | }, | 232 | }, |