]>
Commit | Line | Data |
---|---|---|
2380c486 JR |
1 | --- linux-2.6.20/arch/powerpc/kernel/prom_init.c~ 2007-02-04 19:44:54.000000000 +0100 |
2 | +++ linux-2.6.20/arch/powerpc/kernel/prom_init.c 2007-04-10 01:59:33.712570500 +0200 | |
3 | @@ -429,14 +429,14 @@ | |
4 | } | |
5 | } | |
6 | ||
7 | -static int inline prom_getprop(phandle node, const char *pname, | |
8 | +static inline int prom_getprop(phandle node, const char *pname, | |
9 | void *value, size_t valuelen) | |
10 | { | |
11 | return call_prom("getprop", 4, 1, node, ADDR(pname), | |
12 | (u32)(unsigned long) value, (u32) valuelen); | |
13 | } | |
14 | ||
15 | -static int inline prom_getproplen(phandle node, const char *pname) | |
16 | +static inline int prom_getproplen(phandle node, const char *pname) | |
17 | { | |
18 | return call_prom("getproplen", 2, 1, node, ADDR(pname)); | |
19 | } | |
2380c486 JR |
20 | --- linux-2.6.24-rc8/fs/ocfs2/dir.c.org 2008-01-23 08:32:50.134566450 +0100 |
21 | +++ linux-2.6.24-rc8/fs/ocfs2/dir.c 2008-01-23 08:32:57.441604337 +0100 | |
22 | @@ -126,7 +126,7 @@ | |
23 | /* | |
24 | * Returns 0 if not found, -1 on failure, and 1 on success | |
25 | */ | |
26 | -static int inline ocfs2_search_dirblock(struct buffer_head *bh, | |
27 | +static inline int ocfs2_search_dirblock(struct buffer_head *bh, | |
28 | struct inode *dir, | |
29 | const char *name, int namelen, | |
30 | unsigned long offset, | |
31 | --- linux-2.6.20/drivers/media/video/cx88/cx88.h~ 2007-04-10 01:58:14.000000000 +0200 | |
32 | +++ linux-2.6.20/drivers/media/video/cx88/cx88.h 2007-04-10 02:17:05.442299500 +0200 | |
33 | @@ -89,13 +89,13 @@ | |
34 | /* ----------------------------------------------------------- */ | |
35 | /* tv norms */ | |
36 | ||
37 | -static unsigned int inline norm_maxw(v4l2_std_id norm) | |
38 | +static inline unsigned int norm_maxw(v4l2_std_id norm) | |
39 | { | |
40 | return (norm & (V4L2_STD_MN & ~V4L2_STD_PAL_Nc)) ? 720 : 768; | |
41 | } | |
42 | ||
43 | ||
44 | -static unsigned int inline norm_maxh(v4l2_std_id norm) | |
45 | +static inline unsigned int norm_maxh(v4l2_std_id norm) | |
46 | { | |
47 | return (norm & V4L2_STD_625_50) ? 576 : 480; | |
48 | } | |
49 | --- linux-2.6.20/drivers/isdn/hardware/eicon/platform.h~ 2007-02-04 19:44:54.000000000 +0100 | |
50 | +++ linux-2.6.20/drivers/isdn/hardware/eicon/platform.h 2007-04-10 02:20:13.490051750 +0200 | |
51 | @@ -219,7 +219,7 @@ | |
52 | /* | |
53 | ** I/O Port utilities | |
54 | */ | |
55 | -int diva_os_register_io_port (void *adapter, int register, unsigned long port, | |
56 | +int diva_os_register_io_port (void *adapter, register int, unsigned long port, | |
57 | unsigned long length, const char* name, int id); | |
58 | /* | |
59 | ** I/O port access abstraction | |
60 | @@ -287,13 +287,13 @@ | |
61 | ** atomic operation, fake because we use threads | |
62 | */ | |
63 | typedef int diva_os_atomic_t; | |
64 | -static diva_os_atomic_t __inline__ | |
65 | +static __inline__ diva_os_atomic_t | |
66 | diva_os_atomic_increment(diva_os_atomic_t* pv) | |
67 | { | |
68 | *pv += 1; | |
69 | return (*pv); | |
70 | } | |
71 | -static diva_os_atomic_t __inline__ | |
72 | +static __inline__ diva_os_atomic_t | |
73 | diva_os_atomic_decrement(diva_os_atomic_t* pv) | |
74 | { | |
75 | *pv -= 1; |