Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 329637
b: refs/heads/master
c: fce875d
h: refs/heads/master
i:
  329635: 6f6be48
v: v3
  • Loading branch information
Ben Skeggs committed Oct 3, 2012
1 parent b29683b commit 1d4b301
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 6 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: c0077061e7ea3a8c1c316c87a79976bf8f00beb5
refs/heads/master: fce875d647171f9f740587a252fc026aaa421afe
2 changes: 1 addition & 1 deletion trunk/drivers/gpu/drm/nouveau/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,7 @@ nouveau-y += nv50_fbcon.o nvc0_fbcon.o
# drm/kms/nvd9-

# other random bits
nouveau-$(CONFIG_COMPAT) += nouveau_ioc32.o
nouveau-$(CONFIG_ACPI) += nouveau_acpi.o

##
Expand Down Expand Up @@ -201,7 +202,6 @@ nouveau-y += nv04_pm.o nv40_pm.o nv50_pm.o nva3_pm.o nvc0_pm.o
nouveau-y += nouveau_mem.o

# optional stuff
nouveau-$(CONFIG_COMPAT) += nouveau_ioc32.o
nouveau-$(CONFIG_DRM_NOUVEAU_BACKLIGHT) += nouveau_backlight.o


Expand Down
1 change: 1 addition & 0 deletions trunk/drivers/gpu/drm/nouveau/nouveau_drv.c
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
#include "nouveau_pm.h"
#include "nv50_display.h"
#include "nouveau_acpi.h"
#include "nouveau_ioctl.h"

#include "drm_pciids.h"

Expand Down
3 changes: 0 additions & 3 deletions trunk/drivers/gpu/drm/nouveau/nouveau_drv.h
Original file line number Diff line number Diff line change
Expand Up @@ -405,9 +405,6 @@ int nouveau_ttm_mmap(struct file *, struct vm_area_struct *);
/* nouveau_hdmi.c */
void nouveau_hdmi_mode_set(struct drm_encoder *, struct drm_display_mode *);

extern long nouveau_compat_ioctl(struct file *file, unsigned int cmd,
unsigned long arg);

/* nvd0_display.c */
extern int nvd0_display_create(struct drm_device *);
extern void nvd0_display_destroy(struct drm_device *);
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/gpu/drm/nouveau/nouveau_ioc32.c
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
#include "drmP.h"
#include "drm.h"

#include "nouveau_drv.h"
#include "nouveau_ioctl.h"

/**
* Called whenever a 32-bit process running under a 64-bit kernel
Expand Down
6 changes: 6 additions & 0 deletions trunk/drivers/gpu/drm/nouveau/nouveau_ioctl.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
#ifndef __NOUVEAU_IOCTL_H__
#define __NOUVEAU_IOCTL_H__

long nouveau_compat_ioctl(struct file *, unsigned int cmd, unsigned long arg);

#endif

0 comments on commit 1d4b301

Please sign in to comment.