Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 337466
b: refs/heads/master
c: f68f5f2
h: refs/heads/master
v: v3
  • Loading branch information
Rob Clark authored and Greg Kroah-Hartman committed Oct 30, 2012
1 parent 4248619 commit 03567a9
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 5 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: e6c5abf2542f1a91d31ae536707c00cf0ceaf376
refs/heads/master: f68f5f20675a30197423cf79b42fd4f05b77af43
4 changes: 0 additions & 4 deletions trunk/drivers/staging/omapdrm/omap_drv.c
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,6 @@
#define DRIVER_MINOR 0
#define DRIVER_PATCHLEVEL 0

struct drm_device *drm_device;

static int num_crtc = CONFIG_DRM_OMAP_NUM_CRTCS;

MODULE_PARM_DESC(num_crtc, "Number of overlays to use as CRTCs");
Expand Down Expand Up @@ -562,8 +560,6 @@ static int dev_load(struct drm_device *dev, unsigned long flags)

DBG("load: dev=%p", dev);

drm_device = dev;

priv = kzalloc(sizeof(*priv), GFP_KERNEL);
if (!priv) {
dev_err(dev->dev, "could not allocate priv\n");
Expand Down

0 comments on commit 03567a9

Please sign in to comment.