diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-02-03 16:52:10 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-02-03 16:52:10 -0800 |
commit | 7420b73dc05ae1faa36b49774210a13d29349c53 (patch) | |
tree | 90cdba18724099353598e69b3ee9ee21df9582cf /drivers | |
parent | 3e1c4005134e3a090c64c1bc35f965043bb451f4 (diff) | |
parent | de8696203e64f19ea26f8e096ac8a796e78216b3 (diff) | |
download | linux-7420b73dc05ae1faa36b49774210a13d29349c53.tar.gz linux-7420b73dc05ae1faa36b49774210a13d29349c53.tar.bz2 linux-7420b73dc05ae1faa36b49774210a13d29349c53.zip |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
* master.kernel.org:/home/rmk/linux-2.6-arm:
NVRAM depends on RTC_DRV_CMOS
rename platform_driver name "flash" to "sa1100-mtd"
annotate that [fp, #-4] is the saved lr
Use __SPIN_LOCK_UNLOCKED to initialize bad_irq_desc.lock
ARM: OMAP: fix fault in enter_full_retention()
ARM: OMAP: Mask interrupts when disabling interrupts, v2
ARM: OMAP: gptimer min_delta_ns corrected
ARM: OMAP: Fix hsmmc init, v2
ARM: OMAP: Fix omap34xx revision detection for ES3.1
ARM: OMAP: DMA: Fix uninitialized channel flags
ARM: OMAP: Fix race in OMAP2/3 DMA IRQ handling
ARM: OMAP: Fix McBSP spin_lock deadlock
[ARM] 5366/1: fix shared memory coherency with VIVT L1 + L2 caches
[ARM] call undefined instruction exception handler with irqs enabled
[ARM] msm: fix build errors
[ARM] etherh: continue fixing build failure
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/char/Kconfig | 2 | ||||
-rw-r--r-- | drivers/mtd/maps/sa1100-flash.c | 4 | ||||
-rw-r--r-- | drivers/net/arm/etherh.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig index f5be8081cd81..735bbe2be51a 100644 --- a/drivers/char/Kconfig +++ b/drivers/char/Kconfig @@ -761,7 +761,7 @@ source "drivers/char/hw_random/Kconfig" config NVRAM tristate "/dev/nvram support" - depends on ATARI || X86 || ARM || GENERIC_NVRAM + depends on ATARI || X86 || (ARM && RTC_DRV_CMOS) || GENERIC_NVRAM ---help--- If you say Y here and create a character special file /dev/nvram with major number 10 and minor number 144 using mknod ("man mknod"), diff --git a/drivers/mtd/maps/sa1100-flash.c b/drivers/mtd/maps/sa1100-flash.c index 7df6bbf0e4d9..6f6a0f6dafd6 100644 --- a/drivers/mtd/maps/sa1100-flash.c +++ b/drivers/mtd/maps/sa1100-flash.c @@ -453,7 +453,7 @@ static struct platform_driver sa1100_mtd_driver = { .resume = sa1100_mtd_resume, .shutdown = sa1100_mtd_shutdown, .driver = { - .name = "flash", + .name = "sa1100-mtd", .owner = THIS_MODULE, }, }; @@ -474,4 +474,4 @@ module_exit(sa1100_mtd_exit); MODULE_AUTHOR("Nicolas Pitre"); MODULE_DESCRIPTION("SA1100 CFI map driver"); MODULE_LICENSE("GPL"); -MODULE_ALIAS("platform:flash"); +MODULE_ALIAS("platform:sa1100-mtd"); diff --git a/drivers/net/arm/etherh.c b/drivers/net/arm/etherh.c index d15d8b79d8e5..54b52e5b1821 100644 --- a/drivers/net/arm/etherh.c +++ b/drivers/net/arm/etherh.c @@ -646,7 +646,7 @@ static const struct net_device_ops etherh_netdev_ops = { .ndo_get_stats = ei_get_stats, .ndo_set_multicast_list = ei_set_multicast_list, .ndo_validate_addr = eth_validate_addr, - .ndo_set_mac_address = eth_set_mac_addr, + .ndo_set_mac_address = eth_mac_addr, .ndo_change_mtu = eth_change_mtu, #ifdef CONFIG_NET_POLL_CONTROLLER .ndo_poll_controller = ei_poll, |