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
vserver 1.9.3
[linux-2.6.git]
/
drivers
/
char
/
drm
/
gamma_context.h
diff --git
a/drivers/char/drm/gamma_context.h
b/drivers/char/drm/gamma_context.h
index
d3c8c29
..
d11b507
100644
(file)
--- a/
drivers/char/drm/gamma_context.h
+++ b/
drivers/char/drm/gamma_context.h
@@
-42,7
+42,7
@@
the circular buffer), is based on Alessandro Rubini's LINUX DEVICE
DRIVERS (Cambridge: O'Reilly, 1998), pages 111-113. */
the circular buffer), is based on Alessandro Rubini's LINUX DEVICE
DRIVERS (Cambridge: O'Reilly, 1998), pages 111-113. */
-ssize_t
DRM(read)
(struct file *filp, char __user *buf, size_t count, loff_t *off)
+ssize_t
gamma_fops_read
(struct file *filp, char __user *buf, size_t count, loff_t *off)
{
drm_file_t *priv = filp->private_data;
drm_device_t *dev = priv->dev;
{
drm_file_t *priv = filp->private_data;
drm_device_t *dev = priv->dev;
@@
-128,7
+128,7
@@
int DRM(write_string)(drm_device_t *dev, const char *s)
return 0;
}
return 0;
}
-unsigned int
DRM(poll)
(struct file *filp, struct poll_table_struct *wait)
+unsigned int
gamma_fops_poll
(struct file *filp, struct poll_table_struct *wait)
{
drm_file_t *priv = filp->private_data;
drm_device_t *dev = priv->dev;
{
drm_file_t *priv = filp->private_data;
drm_device_t *dev = priv->dev;