From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 15 Dec 2014 00:43:47 +0000 (-0800)
Subject: Merge tag 'char-misc-3.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregk... 
X-Git-Tag: firefly_0821_release~176^2~2676
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=6ae840e7cc4be0be3aa40d9f67c35c75cfc67d83;p=firefly-linux-kernel-4.4.55.git

Merge tag 'char-misc-3.19-rc1' of git://git./linux/kernel/git/gregkh/char-misc

Pull char/misc driver updates from Greg KH:
 "Here's the big char/misc driver update for 3.19-rc1

  Lots of little things all over the place in different drivers, and a
  new subsystem, "coresight" has been added.  Full details are in the
  shortlog"

* tag 'char-misc-3.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc: (73 commits)
  parport: parport_pc, do not remove parent devices early
  spmi: Remove shutdown/suspend/resume kernel-doc
  carma-fpga-program: drop videobuf dependency
  carma-fpga: drop videobuf dependency
  carma-fpga-program.c: fix compile errors
  i8k: Fix temperature bug handling in i8k_get_temp()
  cxl: Name interrupts in /proc/interrupt
  CXL: Return error to PSL if IRQ demultiplexing fails & print clearer warning
  coresight-replicator: remove .owner field for driver
  coresight: fixed comments in coresight.h
  coresight: fix typo in comment in coresight-priv.h
  coresight: bindings for coresight drivers
  coresight: Adding ABI documentation
  w1: support auto-load of w1_bq27000 module.
  w1: avoid potential u16 overflow
  cn: verify msg->len before making callback
  mei: export fw status registers through sysfs
  mei: read and print all six FW status registers
  mei: txe: add cherrytrail device id
  mei: kill cached host and me csr values
  ...
---

6ae840e7cc4be0be3aa40d9f67c35c75cfc67d83
diff --cc arch/arm/mach-omap2/Kconfig
index 6e249324fdd7,06020fe77e57..f0edec199cd4
--- a/arch/arm/mach-omap2/Kconfig
+++ b/arch/arm/mach-omap2/Kconfig
@@@ -278,14 -282,16 +278,6 @@@ config MACH_SBC353
  	default y
  	select OMAP_PACKAGE_CUS
  
- config OMAP3_EMU
- 	bool "OMAP3 debugging peripherals"
- 	depends on ARCH_OMAP3
- 	select ARM_AMBA
- 	select OC_ETM
- 	help
- 	  Say Y here to enable debugging hardware of omap3
 -config MACH_TI8168EVM
 -	bool "TI8168 Evaluation Module"
 -	depends on SOC_TI81XX
 -	default y
 -
 -config MACH_TI8148EVM
 -	bool "TI8148 Evaluation Module"
 -	depends on SOC_TI81XX
 -	default y
--
  config OMAP3_SDRC_AC_TIMING
  	bool "Enable SDRC AC timing register changes"
  	depends on ARCH_OMAP3