Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 7629
b: refs/heads/master
c: f210973
h: refs/heads/master
i:
  7627: 1fd8d01
v: v3
  • Loading branch information
Dave Airlie authored and Dave Airlie committed Sep 5, 2005
1 parent 64bcde8 commit 8dc39e3
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 89625eb186b9b0b9454d44126f8b1bcc72ad93b7
refs/heads/master: f210973bb6d17aa220c797e8ea23d127d96859b7
2 changes: 1 addition & 1 deletion trunk/drivers/char/drm/drm_bufs.c
Original file line number Diff line number Diff line change
Expand Up @@ -1041,7 +1041,7 @@ static int drm_addbufs_sg(drm_device_t *dev, drm_buf_desc_t *request)
return 0;
}

int drm_addbufs_fb(drm_device_t *dev, drm_buf_desc_t *request)
static int drm_addbufs_fb(drm_device_t *dev, drm_buf_desc_t *request)
{
drm_device_dma_t *dma = dev->dma;
drm_buf_entry_t *entry;
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/char/drm/drm_context.c
Original file line number Diff line number Diff line change
Expand Up @@ -308,7 +308,7 @@ int drm_setsareactx(struct inode *inode, struct file *filp,
*
* Attempt to set drm_device::context_flag.
*/
int drm_context_switch( drm_device_t *dev, int old, int new )
static int drm_context_switch( drm_device_t *dev, int old, int new )
{
if ( test_and_set_bit( 0, &dev->context_flag ) ) {
DRM_ERROR( "Reentering -- FIXME\n" );
Expand Down
1 change: 1 addition & 0 deletions trunk/drivers/char/drm/drm_sysfs.c
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
#include <linux/err.h>

#include "drm_core.h"
#include "drmP.h"

struct drm_sysfs_class {
struct class_device_attribute attr;
Expand Down

0 comments on commit 8dc39e3

Please sign in to comment.