From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 21 Mar 2011 01:14:55 +0000 (-0700)
Subject: Merge branch 'trivial' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6
X-Git-Tag: MMI-PSA29.97-13-9~20456
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=a44f99c7efdb88fa41128065c9a9445c19894e34;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

Merge branch 'trivial' of git://git./linux/kernel/git/mmarek/kbuild-2.6

* 'trivial' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6: (25 commits)
  video: change to new flag variable
  scsi: change to new flag variable
  rtc: change to new flag variable
  rapidio: change to new flag variable
  pps: change to new flag variable
  net: change to new flag variable
  misc: change to new flag variable
  message: change to new flag variable
  memstick: change to new flag variable
  isdn: change to new flag variable
  ieee802154: change to new flag variable
  ide: change to new flag variable
  hwmon: change to new flag variable
  dma: change to new flag variable
  char: change to new flag variable
  fs: change to new flag variable
  xtensa: change to new flag variable
  um: change to new flag variables
  s390: change to new flag variable
  mips: change to new flag variable
  ...

Fix up trivial conflict in drivers/hwmon/Makefile
---

a44f99c7efdb88fa41128065c9a9445c19894e34
diff --cc arch/arm/boot/compressed/Makefile
index f9f77c65dff3,0a53b8aa2e3d..8ebbb511c783
--- a/arch/arm/boot/compressed/Makefile
+++ b/arch/arm/boot/compressed/Makefile
@@@ -95,14 -80,12 +95,14 @@@ ORIG_CFLAGS := $(KBUILD_CFLAGS
  KBUILD_CFLAGS = $(subst -pg, , $(ORIG_CFLAGS))
  endif
  
- EXTRA_CFLAGS  := -fpic -fno-builtin
- EXTRA_AFLAGS  := -Wa,-march=all
+ ccflags-y := -fpic -fno-builtin
+ asflags-y := -Wa,-march=all
  
 +# Provide size of uncompressed kernel to the decompressor via a linker symbol.
 +LDFLAGS_vmlinux = --defsym _image_size=$(shell stat -c "%s" $(obj)/../Image)
  # Supply ZRELADDR to the decompressor via a linker symbol.
  ifneq ($(CONFIG_AUTO_ZRELADDR),y)
 -LDFLAGS_vmlinux := --defsym zreladdr=$(ZRELADDR)
 +LDFLAGS_vmlinux += --defsym zreladdr=$(ZRELADDR)
  endif
  ifeq ($(CONFIG_CPU_ENDIAN_BE8),y)
  LDFLAGS_vmlinux += --be8
diff --cc drivers/hwmon/Makefile
index bd0410e4b44f,974f9cc766b2..8a238dec5691
--- a/drivers/hwmon/Makefile
+++ b/drivers/hwmon/Makefile
@@@ -115,14 -112,5 +115,12 @@@ obj-$(CONFIG_SENSORS_W83L786NG)	+= w83l
  obj-$(CONFIG_SENSORS_WM831X)	+= wm831x-hwmon.o
  obj-$(CONFIG_SENSORS_WM8350)	+= wm8350-hwmon.o
  
 +# PMBus drivers
 +obj-$(CONFIG_PMBUS)		+= pmbus_core.o
 +obj-$(CONFIG_SENSORS_PMBUS)	+= pmbus.o
 +obj-$(CONFIG_SENSORS_MAX16064)	+= max16064.o
 +obj-$(CONFIG_SENSORS_MAX34440)	+= max34440.o
 +obj-$(CONFIG_SENSORS_MAX8688)	+= max8688.o
 +
- ifeq ($(CONFIG_HWMON_DEBUG_CHIP),y)
- EXTRA_CFLAGS += -DDEBUG
- endif
+ ccflags-$(CONFIG_HWMON_DEBUG_CHIP) := -DDEBUG