OpenCloudOS-Kernel/arch
Shawn Guo fa7c865ad9 ARM: mxs: fix compile error caused by prom_update_property change
The commit 475d009 (of: Improve prom_update_property() function)
changed prom_update_property interface, and causes the compile
error below.

  CC      arch/arm/mach-mxs/mach-mxs.o
arch/arm/mach-mxs/mach-mxs.c: In function ‘update_fec_mac_prop’:
arch/arm/mach-mxs/mach-mxs.c:216:4: error: too many arguments to function ‘prom_update_property’
include/linux/of.h:263:12: note: declared here

Update the caller update_fec_mac_prop to fix the error.

Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Signed-off-by: Olof Johansson <olof@lixom.net>
2012-07-25 22:36:39 -07:00
..
alpha Merge branch 'pci/myron-pcibios_setup' into next 2012-07-05 15:31:05 -06:00
arm ARM: mxs: fix compile error caused by prom_update_property change 2012-07-25 22:36:39 -07:00
avr32 fixups for signal breakage 2012-06-04 17:47:34 -04:00
blackfin Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next 2012-07-24 10:01:50 -07:00
c6x Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next 2012-07-24 10:01:50 -07:00
cris cris/PCI: factor out pcibios_setup() 2012-07-05 15:09:07 -06:00
frv frv/PCI: move fixup hooks from __init to __devinit 2012-06-12 09:10:55 -06:00
h8300 h8300/uaccess: add mising __clear_user() 2012-07-11 16:04:46 -07:00
hexagon hexagon: SMP: Remove call to ipi_call_lock()/ipi_call_unlock() 2012-06-05 17:27:11 +02:00
ia64 IOMMU Updates for Linux v3.6-rc1 2012-07-24 16:24:11 -07:00
m32r Merge branch 'smp-hotplug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 2012-07-22 11:22:15 -07:00
m68k Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 2012-07-24 13:34:56 -07:00
microblaze PCI changes for the 3.6 merge window: 2012-07-24 16:17:07 -07:00
mips PCI changes for the 3.6 merge window: 2012-07-24 16:17:07 -07:00
mn10300 Merge branch 'smp-hotplug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 2012-07-22 11:22:15 -07:00
openrisc new helper: signal_delivered() 2012-06-01 12:58:52 -04:00
parisc PCI changes for the 3.6 merge window: 2012-07-24 16:17:07 -07:00
powerpc PCI changes for the 3.6 merge window: 2012-07-24 16:17:07 -07:00
s390 KVM updates for the 3.6 merge window 2012-07-24 12:01:20 -07:00
score new helper: signal_delivered() 2012-06-01 12:58:52 -04:00
sh PCI changes for the 3.6 merge window: 2012-07-24 16:17:07 -07:00
sparc PCI changes for the 3.6 merge window: 2012-07-24 16:17:07 -07:00
tile PCI changes for the 3.6 merge window: 2012-07-24 16:17:07 -07:00
um Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2012-07-19 11:17:30 -07:00
unicore32 PCI changes for the 3.6 merge window: 2012-07-24 16:17:07 -07:00
x86 IOMMU Updates for Linux v3.6-rc1 2012-07-24 16:24:11 -07:00
xtensa PCI changes for the 3.6 merge window: 2012-07-24 16:17:07 -07:00
.gitignore
Kconfig Merge branch 'for-linus' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping 2012-05-25 09:18:59 -07:00