diff options
| author | Linus Torvalds <torvalds@home.transmeta.com> | 2002-11-26 02:45:05 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@home.transmeta.com> | 2002-11-26 02:45:05 -0800 |
| commit | 718b93c1ffcf4d684645309c3536ecf1d46ccc60 (patch) | |
| tree | c0f6305a750fe725e05cd05ddb2a273e2966ae30 /include | |
| parent | 759ee30effbae989ff94e314dc339cd4e6f60167 (diff) | |
| parent | 0763cb7973848ccd0d556650765e522a050552dc (diff) | |
Merge bk://bk.arm.linux.org.uk
into home.transmeta.com:/home/torvalds/v2.5/linux
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-arm/arch-shark/ide.h | 2 | ||||
| -rw-r--r-- | include/asm-arm/arch-shark/irqs.h | 1 | ||||
| -rw-r--r-- | include/asm-arm/arch-shark/memory.h | 2 | ||||
| -rw-r--r-- | include/asm-arm/arch-shark/timex.h | 2 | ||||
| -rw-r--r-- | include/asm-arm/proc-armv/elf.h | 2 | ||||
| -rw-r--r-- | include/asm-arm/suspend.h | 2 |
6 files changed, 6 insertions, 5 deletions
diff --git a/include/asm-arm/arch-shark/ide.h b/include/asm-arm/arch-shark/ide.h index 58ea63b1d180..c3b2a1198e57 100644 --- a/include/asm-arm/arch-shark/ide.h +++ b/include/asm-arm/arch-shark/ide.h @@ -42,6 +42,6 @@ ide_init_default_hwifs(void) ide_init_hwif_ports(&hw, 0x1f0, 0x3f6, NULL); hw.irq = 14; - ide_register_hw(&hw); + ide_register_hw(&hw,NULL); } diff --git a/include/asm-arm/arch-shark/irqs.h b/include/asm-arm/arch-shark/irqs.h index 277d1b5599e5..abe0c68cc6f5 100644 --- a/include/asm-arm/arch-shark/irqs.h +++ b/include/asm-arm/arch-shark/irqs.h @@ -7,5 +7,6 @@ #define NR_IRQS 16 #define IRQ_ISA_KEYBOARD 1 +#define RTC_IRQ 8 #define AUX_IRQ 12 #define IRQ_HARDDISK 14 diff --git a/include/asm-arm/arch-shark/memory.h b/include/asm-arm/arch-shark/memory.h index 47dc994b8b2d..18ab212552de 100644 --- a/include/asm-arm/arch-shark/memory.h +++ b/include/asm-arm/arch-shark/memory.h @@ -38,6 +38,4 @@ #define __bus_to_virt__is_a_macro #define __bus_to_virt(x) __phys_to_virt(x) -#define isa_virt_to_bus virt_to_bus - #endif diff --git a/include/asm-arm/arch-shark/timex.h b/include/asm-arm/arch-shark/timex.h index be2e50ae3b34..0d02d255513b 100644 --- a/include/asm-arm/arch-shark/timex.h +++ b/include/asm-arm/arch-shark/timex.h @@ -3,3 +3,5 @@ * * by Alexander Schulz */ + +#define CLOCK_TICK_RATE 1193180 diff --git a/include/asm-arm/proc-armv/elf.h b/include/asm-arm/proc-armv/elf.h index b2cd010ee344..1b8a0ac3b2b5 100644 --- a/include/asm-arm/proc-armv/elf.h +++ b/include/asm-arm/proc-armv/elf.h @@ -13,7 +13,7 @@ #define ELF_THUMB_OK(x) \ (( (elf_hwcap & HWCAP_THUMB) && ((x)->e_entry & 1) == 1) || \ - (!(elf_hwcap & HWCAP_THUMB) && ((x)->e_entry & 3) == 0)) + ((x)->e_entry & 3) == 0) #define ELF_26BIT_OK(x) \ (( (elf_hwcap & HWCAP_26BIT) && (x)->e_flags & EF_ARM_APCS26) || \ diff --git a/include/asm-arm/suspend.h b/include/asm-arm/suspend.h index 5e4c1cc0c19d..cf0d0bdee74d 100644 --- a/include/asm-arm/suspend.h +++ b/include/asm-arm/suspend.h @@ -1,4 +1,4 @@ -#ifdef _ASMARM_SUSPEND_H +#ifndef _ASMARM_SUSPEND_H #define _ASMARM_SUSPEND_H #endif |