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]
/
drivers
/
macintosh
/
ans-lcd.c
diff --git
a/drivers/macintosh/ans-lcd.c
b/drivers/macintosh/ans-lcd.c
index
5e0811d
..
2b8a6e8
100644
(file)
--- a/
drivers/macintosh/ans-lcd.c
+++ b/
drivers/macintosh/ans-lcd.c
@@
-27,7
+27,7
@@
static volatile unsigned char __iomem *anslcd_ptr;
#undef DEBUG
#undef DEBUG
-static void
__pmac
+static void
anslcd_write_byte_ctrl ( unsigned char c )
{
#ifdef DEBUG
anslcd_write_byte_ctrl ( unsigned char c )
{
#ifdef DEBUG
@@
-43,14
+43,14
@@
anslcd_write_byte_ctrl ( unsigned char c )
}
}
}
}
-static void
__pmac
+static void
anslcd_write_byte_data ( unsigned char c )
{
out_8(anslcd_ptr + ANSLCD_DATA_IX, c);
udelay(anslcd_short_delay);
}
anslcd_write_byte_data ( unsigned char c )
{
out_8(anslcd_ptr + ANSLCD_DATA_IX, c);
udelay(anslcd_short_delay);
}
-static ssize_t
__pmac
+static ssize_t
anslcd_write( struct file * file, const char __user * buf,
size_t count, loff_t *ppos )
{
anslcd_write( struct file * file, const char __user * buf,
size_t count, loff_t *ppos )
{
@@
-73,7
+73,7
@@
anslcd_write( struct file * file, const char __user * buf,
return p - buf;
}
return p - buf;
}
-static int
__pmac
+static int
anslcd_ioctl( struct inode * inode, struct file * file,
unsigned int cmd, unsigned long arg )
{
anslcd_ioctl( struct inode * inode, struct file * file,
unsigned int cmd, unsigned long arg )
{
@@
-115,7
+115,7
@@
anslcd_ioctl( struct inode * inode, struct file * file,
}
}
}
}
-static int
__pmac
+static int
anslcd_open( struct inode * inode, struct file * file )
{
return 0;
anslcd_open( struct inode * inode, struct file * file )
{
return 0;