git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git]
/
include
/
asm-sparc
/
sbus.h
diff --git
a/include/asm-sparc/sbus.h
b/include/asm-sparc/sbus.h
index
3a8b390
..
a13cddc
100644
(file)
--- a/
include/asm-sparc/sbus.h
+++ b/
include/asm-sparc/sbus.h
@@
-28,12
+28,12
@@
* numbers + offsets, and vice versa.
*/
* numbers + offsets, and vice versa.
*/
-
extern __inline__
unsigned long sbus_devaddr(int slotnum, unsigned long offset)
+
static inline
unsigned long sbus_devaddr(int slotnum, unsigned long offset)
{
return (unsigned long) (SUN_SBUS_BVADDR+((slotnum)<<25)+(offset));
}
{
return (unsigned long) (SUN_SBUS_BVADDR+((slotnum)<<25)+(offset));
}
-
extern __inline__
int sbus_dev_slot(unsigned long dev_addr)
+
static inline
int sbus_dev_slot(unsigned long dev_addr)
{
return (int) (((dev_addr)-SUN_SBUS_BVADDR)>>25);
}
{
return (int) (((dev_addr)-SUN_SBUS_BVADDR)>>25);
}
@@
-80,7
+80,7
@@
struct sbus_bus {
extern struct sbus_bus *sbus_root;
extern struct sbus_bus *sbus_root;
-
extern __inline__
int
+
static inline
int
sbus_is_slave(struct sbus_dev *dev)
{
/* XXX Have to write this for sun4c's */
sbus_is_slave(struct sbus_dev *dev)
{
/* XXX Have to write this for sun4c's */