summaryrefslogtreecommitdiffstats
path: root/include/asm-sparc64/sbus.h
diff options
context:
space:
mode:
authorDavid S. Miller <davem@sunset.davemloft.net>2007-10-27 09:13:04 +0200
committerDavid S. Miller <davem@sunset.davemloft.net>2007-10-27 09:13:04 +0200
commitd979f1792d1a4867eda0028b3aac8c6d4a535bb7 (patch)
tree89a8a9471ad2fa57f7349426ac62d14f3f134c63 /include/asm-sparc64/sbus.h
parentMerge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/... (diff)
downloadlinux-d979f1792d1a4867eda0028b3aac8c6d4a535bb7.tar.xz
linux-d979f1792d1a4867eda0028b3aac8c6d4a535bb7.zip
[SPARC64]: __inline__ --> inline
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/asm-sparc64/sbus.h')
-rw-r--r--include/asm-sparc64/sbus.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/asm-sparc64/sbus.h b/include/asm-sparc64/sbus.h
index 0151cad486f3..24a04a55cf85 100644
--- a/include/asm-sparc64/sbus.h
+++ b/include/asm-sparc64/sbus.h
@@ -29,12 +29,12 @@
* numbers + offsets, and vice versa.
*/
-static __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)<<28)+(offset));
}
-static __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)>>28);
}