[ARM] S3C2440: Merge branch next-mini2440 into next-s3c

Merge branch 'next-mini2440' into next-s3c

diff --combined Documentation/kernel-parameters.txt
index ad38006307725ff2a563d9e86e78230df0879e22,4b765b7ded9fb0a107dc0f1c1f9fef2434537250..4426e0b81a11630ad7e741cd608348c177e2e8b2
--- 1/Documentation/kernel-parameters.txt
--- 2/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@@ -491,13 -491,6 +491,13 @@@ and is between 256 and 4096 characters
                        Also note the kernel might malfunction if you disable
                        some critical bits.
  
 +      cmo_free_hint=  [PPC] Format: { yes | no }
 +                      Specify whether pages are marked as being inactive
 +                      when they are freed.  This is used in CMO environments
 +                      to determine OS memory pressure for page stealing by
 +                      a hypervisor.
 +                      Default: yes
 +
        code_bytes      [X86] How many bytes of object code to print
                        in an oops report.
                        Range: 0 - 8192
@@@ -1358,6 -1351,27 +1358,27 @@@
        min_addr=nn[KMG]        [KNL,BOOT,ia64] All physical memory below this
                        physical address is ignored.
  
+       mini2440=       [ARM,HW,KNL]
+                       Format:[0..2][b][c][t]
+                       Default: "0tb"
+                       MINI2440 configuration specification:
+                       0 - The attached screen is the 3.5" TFT
+                       1 - The attached screen is the 7" TFT
+                       2 - The VGA Shield is attached (1024x768)
+                       Leaving out the screen size parameter will not load
+                       the TFT driver, and the framebuffer will be left
+                       unconfigured.
+                       b - Enable backlight. The TFT backlight pin will be
+                       linked to the kernel VESA blanking code and a GPIO
+                       LED. This parameter is not necessary when using the
+                       VGA shield.
+                       c - Enable the s3c camera interface.
+                       t - Reserved for enabling touchscreen support. The
+                       touchscreen support is not enabled in the mainstream
+                       kernel as of 2.6.30, a preliminary port can be found
+                       in the "bleeding edge" mini2440 support kernel at
+                       http://repo.or.cz/w/linux-2.6/mini2440.git
+ 
        mminit_loglevel=
                        [KNL] When CONFIG_DEBUG_MEMORY_INIT is set, this
                        parameter allows control of the logging verbosity for