Commit 711fa8096863e4b50bb97f9ebc44606dc2182ac3

Authored by Paul Mundt
1 parent 059fbd6a5e

sh: build fixes for defconfigs.

Get all of the defconfigs building again.

Signed-off-by: Paul Mundt <lethal@linux-sh.org>

Showing 16 changed files with 33 additions and 33 deletions Side-by-side Diff

arch/sh/boards/landisk/irq.c
... ... @@ -83,7 +83,7 @@
83 83 static void make_landisk_irq(unsigned int irq)
84 84 {
85 85 disable_irq_nosync(irq);
86   - irq_desc[irq].handler = &landisk_irq_type;
  86 + irq_desc[irq].chip = &landisk_irq_type;
87 87 disable_landisk_irq(irq);
88 88 }
89 89  
arch/sh/boards/renesas/r7780rp/irq.c
... ... @@ -83,7 +83,7 @@
83 83 static void make_r7780rp_irq(unsigned int irq)
84 84 {
85 85 disable_irq_nosync(irq);
86   - irq_desc[irq].handler = &r7780rp_irq_type;
  86 + irq_desc[irq].chip = &r7780rp_irq_type;
87 87 disable_r7780rp_irq(irq);
88 88 }
89 89  
arch/sh/boards/renesas/systemh/setup.c
... ... @@ -53,7 +53,7 @@
53 53 .mv_outsw = sh7751systemh_outsw,
54 54 .mv_outsl = sh7751systemh_outsl,
55 55  
56   - .mv_init_irq = sh7751system_init_irq,
  56 + .mv_init_irq = sh7751systemh_init_irq,
57 57 };
58 58 ALIAS_MV(7751systemh)
arch/sh/boards/se/7343/irq.c
... ... @@ -73,7 +73,7 @@
73 73 make_intreq_irq(unsigned int irq)
74 74 {
75 75 disable_irq_nosync(irq);
76   - irq_desc[irq].handler = &intreq_irq_type;
  76 + irq_desc[irq].chip = &intreq_irq_type;
77 77 disable_intreq_irq(irq);
78 78 }
79 79  
arch/sh/boards/se/770x/setup.c
... ... @@ -8,13 +8,10 @@
8 8 *
9 9 */
10 10 #include <linux/init.h>
11   -#include <linux/irq.h>
12   -#include <linux/hdreg.h>
13   -#include <linux/ide.h>
14   -#include <asm/io.h>
  11 +#include <asm/machvec.h>
15 12 #include <asm/se.h>
  13 +#include <asm/io.h>
16 14 #include <asm/smc37c93x.h>
17   -#include <asm/machvec.h>
18 15  
19 16 void heartbeat_se(void);
20 17 void init_se_IRQ(void);
arch/sh/boards/se/7751/setup.c
... ... @@ -8,12 +8,10 @@
8 8 * Modified for 7751 Solution Engine by
9 9 * Ian da Silva and Jeremy Siegel, 2001.
10 10 */
11   -
12 11 #include <linux/init.h>
13   -#include <linux/irq.h>
14   -#include <linux/ide.h>
15   -#include <asm/io.h>
  12 +#include <asm/machvec.h>
16 13 #include <asm/se7751.h>
  14 +#include <asm/io.h>
17 15  
18 16 void heartbeat_7751se(void);
19 17 void init_7751se_IRQ(void);
arch/sh/boards/sh03/setup.c
... ... @@ -7,6 +7,7 @@
7 7  
8 8 #include <linux/init.h>
9 9 #include <linux/irq.h>
  10 +#include <linux/pci.h>
10 11 #include <asm/io.h>
11 12 #include <asm/rtc.h>
12 13 #include <asm/sh03/io.h>
arch/sh/drivers/dma/dma-sysfs.c
... ... @@ -48,12 +48,11 @@
48 48 int ret;
49 49  
50 50 ret = sysdev_class_register(&dma_sysclass);
51   - if (ret == 0)
52   - sysfs_create_file(&dma_sysclass.kset.kobj, &attr_devices.attr);
  51 + if (unlikely(ret))
  52 + return ret;
53 53  
54   - return ret;
  54 + return sysfs_create_file(&dma_sysclass.kset.kobj, &attr_devices.attr);
55 55 }
56   -
57 56 postcore_initcall(dma_sysclass_init);
58 57  
59 58 static ssize_t dma_show_dev_id(struct sys_device *dev, char *buf)
arch/sh/drivers/pci/ops-sh03.c
... ... @@ -35,10 +35,10 @@
35 35 .flags = IORESOURCE_MEM
36 36 };
37 37  
38   -extern struct pci_ops sh7751_pci_ops;
  38 +extern struct pci_ops sh4_pci_ops;
39 39  
40 40 struct pci_channel board_pci_channels[] = {
41   - { &sh7751_pci_ops, &sh7751_io_resource, &sh7751_mem_resource, 0, 0xff },
  41 + { &sh4_pci_ops, &sh7751_io_resource, &sh7751_mem_resource, 0, 0xff },
42 42 { NULL, NULL, NULL, 0, 0 },
43 43 };
arch/sh/kernel/entry.S
... ... @@ -10,8 +10,8 @@
10 10 * for more details.
11 11 *
12 12 */
13   -
14 13 #include <linux/sys.h>
  14 +#include <linux/errno.h>
15 15 #include <linux/linkage.h>
16 16 #include <asm/asm-offsets.h>
17 17 #include <asm/thread_info.h>
... ... @@ -53,10 +53,6 @@
53 53 * syscall #
54 54 *
55 55 */
56   -
57   -ENOSYS = 38
58   -EINVAL = 22
59   -
60 56 #if defined(CONFIG_KGDB_NMI)
61 57 NMI_VEC = 0x1c0 ! Must catch early for debounce
62 58 #endif
arch/sh/kernel/setup.c
1   -/* $Id: setup.c,v 1.30 2003/10/13 07:21:19 lethal Exp $
2   - *
  1 +/*
3 2 * linux/arch/sh/kernel/setup.c
4 3 *
5 4 * Copyright (C) 1999 Niibe Yutaka
... ... @@ -21,6 +20,7 @@
21 20 #include <linux/utsname.h>
22 21 #include <linux/cpu.h>
23 22 #include <linux/pfn.h>
  23 +#include <linux/fs.h>
24 24 #include <asm/uaccess.h>
25 25 #include <asm/io.h>
26 26 #include <asm/sections.h>
arch/sh/kernel/sh_ksyms.c
... ... @@ -72,6 +72,7 @@
72 72 DECLARE_EXPORT(__ashldi3);
73 73 DECLARE_EXPORT(__lshrdi3);
74 74 DECLARE_EXPORT(__movstr);
  75 +DECLARE_EXPORT(__movstrSI16);
75 76  
76 77 EXPORT_SYMBOL(strcpy);
77 78  
arch/sh/mm/cache-debugfs.c
... ... @@ -111,7 +111,7 @@
111 111  
112 112 static int cache_debugfs_open(struct inode *inode, struct file *file)
113 113 {
114   - return single_open(file, cache_seq_show, inode->u.generic_ip);
  114 + return single_open(file, cache_seq_show, inode->i_private);
115 115 }
116 116  
117 117 static struct file_operations cache_debugfs_fops = {
include/asm-sh/elf.h
1 1 #ifndef __ASM_SH_ELF_H
2 2 #define __ASM_SH_ELF_H
3 3  
4   -#include <asm/processor.h>
5 4 #include <asm/auxvec.h>
6 5 #include <asm/ptrace.h>
7 6 #include <asm/user.h>
include/asm-sh/rts7751r2d/rts7751r2d.h
... ... @@ -68,5 +68,8 @@
68 68 #define IRQ_PCISLOT2 10 /* PCI Slot #2 IRQ */
69 69 #define IRQ_EXTENTION 11 /* EXTn IRQ */
70 70  
  71 +#define __IO_PREFIX rts7751r2d
  72 +#include <asm/io_generic.h>
  73 +
71 74 #endif /* __ASM_SH_RENESAS_RTS7751R2D */
include/asm-sh/string.h
1 1 #ifndef __ASM_SH_STRING_H
2 2 #define __ASM_SH_STRING_H
3 3  
  4 +#ifdef __KERNEL__
  5 +
4 6 /*
5 7 * Copyright (C) 1999 Niibe Yutaka
6 8 * But consider these trivial functions to be public domain.
7 9 */
8 10  
9 11 #define __HAVE_ARCH_STRCPY
10   -static __inline__ char *strcpy(char *__dest, const char *__src)
  12 +static inline char *strcpy(char *__dest, const char *__src)
11 13 {
12 14 register char *__xdest = __dest;
13 15 unsigned long __dummy;
... ... @@ -26,7 +28,7 @@
26 28 }
27 29  
28 30 #define __HAVE_ARCH_STRNCPY
29   -static __inline__ char *strncpy(char *__dest, const char *__src, size_t __n)
  31 +static inline char *strncpy(char *__dest, const char *__src, size_t __n)
30 32 {
31 33 register char *__xdest = __dest;
32 34 unsigned long __dummy;
... ... @@ -52,7 +54,7 @@
52 54 }
53 55  
54 56 #define __HAVE_ARCH_STRCMP
55   -static __inline__ int strcmp(const char *__cs, const char *__ct)
  57 +static inline int strcmp(const char *__cs, const char *__ct)
56 58 {
57 59 register int __res;
58 60 unsigned long __dummy;
... ... @@ -78,7 +80,7 @@
78 80 }
79 81  
80 82 #define __HAVE_ARCH_STRNCMP
81   -static __inline__ int strncmp(const char *__cs, const char *__ct, size_t __n)
  83 +static inline int strncmp(const char *__cs, const char *__ct, size_t __n)
82 84 {
83 85 register int __res;
84 86 unsigned long __dummy;
... ... @@ -123,6 +125,11 @@
123 125  
124 126 #define __HAVE_ARCH_STRLEN
125 127 extern size_t strlen(const char *);
  128 +
  129 +/* arch/sh/lib/strcasecmp.c */
  130 +extern int strcasecmp(const char *, const char *);
  131 +
  132 +#endif /* __KERNEL__ */
126 133  
127 134 #endif /* __ASM_SH_STRING_H */