From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 20 May 2010 20:34:17 +0000 (-0700)
Subject: Merge branch 'viafb-next' of git://git.lwn.net/linux-2.6
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=7c6d87ac843bfbc5a7669736882a0e88c217a820;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

Merge branch 'viafb-next' of git://git.lwn.net/linux-2.6

* 'viafb-next' of git://git.lwn.net/linux-2.6: (35 commits)
  viafb: move some include files to include/linux
  viafb: Eliminate some global.h references
  viafb: get rid of i2c debug cruft
  viafb: fold via_io.h into via-core.h
  viafb: Fix initialization error paths
  viafb: Do not remove gpiochip under spinlock
  viafb: make procfs entries optional
  viafb: fix proc entry removal
  viafb: improve misc register handling
  viafb: replace inb/outb
  viafb: move some modesetting functions to a seperate file
  viafb: unify modesetting functions
  viafb: Reserve framebuffer memory for the upcoming camera driver
  viafb: Add a simple VX855 DMA engine driver
  viafb: Add a simple interrupt management infrastructure
  via: Rationalize vt1636 detection
  viafb: Introduce viafb_find_i2c_adapter()
  via: Do not attempt I/O on inactive I2C adapters
  viafb: Turn GPIO and i2c into proper platform devices
  viafb: Convert GPIO and i2c to the new indexed port ops
  ...
---

7c6d87ac843bfbc5a7669736882a0e88c217a820
diff --cc drivers/video/via/viafbdev.c
index 777b38a06d40,d3dd2eb95586..2bc40e682f95
--- a/drivers/video/via/viafbdev.c
+++ b/drivers/video/via/viafbdev.c
@@@ -21,10 -21,10 +21,11 @@@
  
  #include <linux/module.h>
  #include <linux/seq_file.h>
 +#include <linux/slab.h>
  #include <linux/stat.h>
- #define _MASTER_FILE
+ #include <linux/via-core.h>
  
+ #define _MASTER_FILE
  #include "global.h"
  
  static char *viafb_name = "Via";