linux-stable.git/drivers/staging/android/Kconfig, branch v3.5

Merge tag 'staging-3.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging

2012-05-22T23:34:21+00:00

Pull staging tree changes from Greg Kroah-Hartman:
 "Here is the big staging tree pull request for the 3.5-rc1 merge
  window.

  Loads of changes here, and we just narrowly added more lines than we
  added:
   622 files changed, 28356 insertions(+), 26059 deletions(-)

  But, good news is that there is a number of subsystems that moved out
  of the staging tree, to their respective "real" portions of the
  kernel.

  Code that moved out was:
	- iio core code
	- mei driver
	- vme core and bridge drivers

  There was one broken network driver that moved into staging as a step
  before it is removed from the tree (pc300), and there was a few new
  drivers added to the tree:
	- new iio drivers
	- gdm72xx wimax USB driver
	- ipack subsystem and 2 drivers

  All of the movements around have acks from the various subsystem
  maintainers, and all of this has been in the linux-next tree for a
  while.

  Signed-off-by: Greg Kroah-Hartman "

Fixed up various trivial conflicts, along with a non-trivial one found
in -next and pointed out by Olof Johanssen: a clean - but incorrect -
merge of the arch/arm/boot/dts/at91sam9g20.dtsi file.  Fix up manually
as per Stephen Rothwell.

* tag 'staging-3.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (536 commits)
  Staging: bcm: Remove two unused variables from Adapter.h
  Staging: bcm: Removes the volatile type definition from Adapter.h
  Staging: bcm: Rename all "INT" to "int" in Adapter.h
  Staging: bcm: Fix warning: __packed vs. __attribute__((packed)) in Adapter.h
  Staging: bcm: Correctly format all comments in Adapter.h
  Staging: bcm: Fix all whitespace issues in Adapter.h
  Staging: bcm: Properly format braces in Adapter.h
  Staging: ipack/bridges/tpci200: remove unneeded casts
  Staging: ipack/bridges/tpci200: remove TPCI200_SHORTNAME constant
  Staging: ipack: remove board_name and bus_name fields from struct ipack_device
  Staging: ipack: improve the register of a bus and a device in the bus.
  staging: comedi: cleanup all the comedi_driver 'detach' functions
  staging: comedi: remove all 'default N' in Kconfig
  staging: line6/config.h: Delete unused header
  staging: gdm72xx depends on NET
  staging: gdm72xx: Set up parent link in sysfs for gdm72xx devices
  staging: drm/omap: initial dmabuf/prime import support
  staging: drm/omap: dmabuf/prime mmap support
  pstore/ram: Add ECC support
  pstore/ram: Switch to persistent_ram routines
  ...

staging: android: persistent_ram: Move to fs/pstore/ram_core.c

2012-05-17T15:50:00+00:00

This is a first step for adding ECC support for pstore RAM backend: we
will use the persistent_ram routines, kindly provided by Google.

Basically, persistent_ram is a set of helper routines to deal with the
[optionally] ECC-protected persistent ram regions.

A bit of Makefile, Kconfig and header files adjustments were needed
because of the move.

Signed-off-by: Anton Vorontsov 
Acked-by: Kees Cook 
Signed-off-by: Greg Kroah-Hartman

Merge 3.4-rc5 into driver-core-next

2012-05-02T21:33:37+00:00

This was done to resolve a merge issue with the init/main.c file.

Reported-by: Stephen Rothwell 
Signed-off-by: Greg Kroah-Hartman

Merge 3.4-rc5 into staging-next

2012-05-02T18:48:07+00:00

This resolves the conflict in:
	drivers/staging/vt6656/ioctl.c

Signed-off-by: Greg Kroah-Hartman

Remove "switch" class in drivers/staging/android/switch

2012-04-23T20:24:00+00:00

Because extcon can also be a switch class for legacy userspace (Android)
and is a superset of switch class in drivers/staging/android/switch,
switch class may be removed.

- Remove switch class
- Remove switch class consideration in extcon class

Signed-off-by: MyungJoo Ham 
Signed-off-by: Kyungmin Park 
Signed-off-by: Greg Kroah-Hartman

android-alarm: Remove unused android alarm in-kernel interfaces

2012-04-20T22:06:25+00:00

Now that alarm-dev.c uses the upstreamed alarmtimer interfaces,
we can remove the otherwise unused in-kernel android alarm api.

CC: Colin Cross 
CC: Thomas Gleixner 
CC: Android Kernel Team 
Signed-off-by: John Stultz 
Signed-off-by: Greg Kroah-Hartman

android: make persistent_ram based drivers depend on HAVE_MEMBLOCK

2012-04-10T16:48:29+00:00

m68k doesn't have memblock_reserve, which causes a build failure
with allmodconfig.  Make PERSISTENT_RAM and RAM_CONSOLE depend on
HAVE_MEMBLOCK.

Reported-by: Geert Uytterhoeven 
Reported-by: Paul Gortmaker 
Signed-off-by: Colin Cross 
Signed-off-by: Greg Kroah-Hartman

staging: android: persistent_ram: refactor ecc support

2012-03-08T17:36:08+00:00

Remove CONFIG_ANDROID_RAM_CONSOLE_ERROR_CORRECTION and related
 #ifdefs.  Also allow persistent ram zones without ecc enabled.
For some use cases, like the data portion of the upcoming
persistent_vars patches, or a persistent ftrace ringbuffer,
ecc on every update is too expensive.

CC: Greg KH 
CC: Android Kernel Team 
Signed-off-by: Colin Cross 
Signed-off-by: John Stultz 
Signed-off-by: Greg Kroah-Hartman

staging: android: ram_console: split out persistent ram

2012-03-08T17:36:08+00:00

Split ram_console into two halves.

persistent_ram is a set of apis that handle a block of memory
that does not get erased across a reboot.  It provides functions
to fill it as a single buffer or a ring buffer, and to extract
the old data after a reboot.  It handles ecc on the data to
correct bit errors introduced during reboot.

ram_console is now a small wrapper around persistent_ram that
feeds console data into the ringbuffer, and exports the old
data to /proc/last_kmsg after a reboot.

[jstultz: Moved persistent_ram.h to staging dir]
CC: Greg KH 
CC: Android Kernel Team 
Signed-off-by: Colin Cross 
Signed-off-by: John Stultz 
Signed-off-by: Greg Kroah-Hartman

staging: android: ram_console: drop verbose ram_console support

2012-03-08T02:32:40+00:00

Equivalent functionality can be obtained with loglevel=15

CC: Android Kernel Team 
Signed-off-by: Colin Cross 
Signed-off-by: John Stultz 
Signed-off-by: Greg Kroah-Hartman