Merge branch 'late/fixes' into fixes
This is a series from Arnd that fixes a number of compiler warnings when building defconfigs on ARM. * late/fixes: ARM: footbridge: nw_gpio_lock is raw_spin_lock ARM: mv78xx0: correct addr_map_cfg __initdata annotation ARM: footbridge: remove RTC_IRQ definition ARM: soc: dependency warnings for errata ARM: ks8695: __arch_virt_to_dma type handling ARM: rpc: check device_register return code in ecard_probe ARM: davinci: don't mark da850_register_cpufreq as __init ARM: iop13xx: fix iq81340sc_atux_map_irq prototype ARM: iop13xx: mark iop13xx_scan_bus as __devinit ARM: mv78xx0: mark mv78xx0_timer_init as __init_refok ARM: s3c24xx: fix multiple section mismatch warnings ARM: at91: unused variable in at91_pm_verify_clocks ARM: at91: skip at91_io_desc definition for NOMMU ARM: pxa: work around duplicate definition of GPIO24_SSP1_SFRM ARM: pxa: remove sharpsl_fatal_check function ARM: pxa: define palmte2_pxa_keys conditionally ARM: pxa: Wunused-result warning in viper board file ARM: shark: fix shark_pci_init return code Fixed trivial conflicts in arch/arm/mach-at91/setup.c. Signed-off-by: Olof Johansson <olof@lixom.net>
This commit is contained in:
@@ -89,8 +89,6 @@
|
||||
#define IRQ_NETWINDER_VGA _ISA_IRQ(11)
|
||||
#define IRQ_NETWINDER_SOUND _ISA_IRQ(12)
|
||||
|
||||
#undef RTC_IRQ
|
||||
#define RTC_IRQ IRQ_ISA_RTC_ALARM
|
||||
#define I8042_KBD_IRQ IRQ_ISA_KEYBOARD
|
||||
#define I8042_AUX_IRQ (machine_is_netwinder() ? IRQ_NETWINDER_PS2MOUSE : IRQ_ISA_PS2MOUSE)
|
||||
#define IRQ_FLOPPYDISK IRQ_ISA_FLOPPY
|
||||
|
Reference in New Issue
Block a user