diff options
| author | Geert Uytterhoeven <geert@linux-m68k.org> | 2002-07-23 06:21:36 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@home.transmeta.com> | 2002-07-23 06:21:36 -0700 |
| commit | dbeb22aa702610a0805106bd2e54fc4f218edf45 (patch) | |
| tree | a05eb7dccbc2693073d39b2bde18eb8ba30374e5 /include | |
| parent | 7d5095ea9ebe48d7e4040b8acc26fe3b68b3901c (diff) | |
[PATCH] M68k update (part 11)
Fix miscellaneous compilation warnings and errors
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-m68k/apollodma.h | 2 | ||||
| -rw-r--r-- | include/asm-m68k/atarihw.h | 2 | ||||
| -rw-r--r-- | include/asm-m68k/bitops.h | 2 | ||||
| -rw-r--r-- | include/asm-m68k/hw_irq.h | 6 | ||||
| -rw-r--r-- | include/asm-m68k/irq.h | 2 | ||||
| -rw-r--r-- | include/asm-m68k/macintosh.h | 3 | ||||
| -rw-r--r-- | include/asm-m68k/semaphore-helper.h | 1 | ||||
| -rw-r--r-- | include/asm-m68k/suspend.h | 6 | ||||
| -rw-r--r-- | include/linux/intermezzo_fs.h | 1 |
9 files changed, 20 insertions, 5 deletions
diff --git a/include/asm-m68k/apollodma.h b/include/asm-m68k/apollodma.h index 3abef61cb67e..558dfd220f74 100644 --- a/include/asm-m68k/apollodma.h +++ b/include/asm-m68k/apollodma.h @@ -9,7 +9,7 @@ #define _ASM_APOLLO_DMA_H #include <asm/apollohw.h> /* need byte IO */ -#include <asm/spinlock.h> /* And spinlocks */ +#include <linux/spinlock.h> /* And spinlocks */ #include <linux/delay.h> diff --git a/include/asm-m68k/atarihw.h b/include/asm-m68k/atarihw.h index f53a9354db01..feb510043c50 100644 --- a/include/asm-m68k/atarihw.h +++ b/include/asm-m68k/atarihw.h @@ -133,7 +133,7 @@ extern struct atari_hw_present atari_hw_present; #include <linux/mm.h> -#include <asm/pgalloc.h> +#include <asm/cacheflush.h> static inline void dma_cache_maintenance( unsigned long paddr, unsigned long len, diff --git a/include/asm-m68k/bitops.h b/include/asm-m68k/bitops.h index ce7544adffa7..fb9146e78ecc 100644 --- a/include/asm-m68k/bitops.h +++ b/include/asm-m68k/bitops.h @@ -8,6 +8,8 @@ * for more details. */ +#include <linux/compiler.h> + /* * Require 68020 or better. * diff --git a/include/asm-m68k/hw_irq.h b/include/asm-m68k/hw_irq.h new file mode 100644 index 000000000000..eacef0951fbf --- /dev/null +++ b/include/asm-m68k/hw_irq.h @@ -0,0 +1,6 @@ +#ifndef __ASM_M68K_HW_IRQ_H +#define __ASM_M68K_HW_IRQ_H + +/* Dummy include. */ + +#endif diff --git a/include/asm-m68k/irq.h b/include/asm-m68k/irq.h index be2dfbd61ea1..27e030fa6e7c 100644 --- a/include/asm-m68k/irq.h +++ b/include/asm-m68k/irq.h @@ -73,6 +73,8 @@ extern void (*disable_irq)(unsigned int); #define disable_irq_nosync disable_irq #define enable_irq_nosync enable_irq +struct pt_regs; + extern int sys_request_irq(unsigned int, void (*)(int, void *, struct pt_regs *), unsigned long, const char *, void *); diff --git a/include/asm-m68k/macintosh.h b/include/asm-m68k/macintosh.h index 68d1249d3cea..47ad33cc2254 100644 --- a/include/asm-m68k/macintosh.h +++ b/include/asm-m68k/macintosh.h @@ -39,9 +39,6 @@ extern void print_booter(char *ptr); * Macintosh Table */ -struct mac_model *macintosh_config; - - struct mac_model { short ident; diff --git a/include/asm-m68k/semaphore-helper.h b/include/asm-m68k/semaphore-helper.h index aa38ab88eab4..1516a642f9a5 100644 --- a/include/asm-m68k/semaphore-helper.h +++ b/include/asm-m68k/semaphore-helper.h @@ -10,6 +10,7 @@ */ #include <linux/config.h> +#include <linux/errno.h> /* * These two _must_ execute atomically wrt each other. diff --git a/include/asm-m68k/suspend.h b/include/asm-m68k/suspend.h new file mode 100644 index 000000000000..57b3ddb4d269 --- /dev/null +++ b/include/asm-m68k/suspend.h @@ -0,0 +1,6 @@ +#ifndef _M68K_SUSPEND_H +#define _M68K_SUSPEND_H + +/* Dummy include. */ + +#endif /* _M68K_SUSPEND_H */ diff --git a/include/linux/intermezzo_fs.h b/include/linux/intermezzo_fs.h index a0fe6dbc4622..07e89b41d407 100644 --- a/include/linux/intermezzo_fs.h +++ b/include/linux/intermezzo_fs.h @@ -19,6 +19,7 @@ #ifdef __KERNEL__ #include <linux/smp.h> #include <linux/fsfilter.h> +#include <linux/namei.h> /* fixups for fs.h */ #ifndef fs_down |