diff options
| -rw-r--r-- | arch/arm/boot/compressed/ofw-shark.c | 2 | ||||
| -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 |
5 files changed, 5 insertions, 4 deletions
diff --git a/arch/arm/boot/compressed/ofw-shark.c b/arch/arm/boot/compressed/ofw-shark.c index 2091e68d4ba7..0d62ff36f991 100644 --- a/arch/arm/boot/compressed/ofw-shark.c +++ b/arch/arm/boot/compressed/ofw-shark.c @@ -27,7 +27,7 @@ create_params (unsigned long *buffer) /* Head of the taglist */ tag->hdr.tag = ATAG_CORE; tag->hdr.size = tag_size(tag_core); - tag->u.core.flags = FLAG_READONLY; + tag->u.core.flags = 1; tag->u.core.pagesize = PAGE_SIZE; tag->u.core.rootdev = 0; 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 |
