Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a44f99c7 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'trivial' of git://git.kernel.org/pub/scm/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
parents b87a2d3e 22942c00

arch/arm/boot/compressed/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -95,8 +95,8 @@ 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)

arch/arm/vfp/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -4,8 +4,8 @@ 
# Copyright (C) 2001 ARM Limited

#



# EXTRA_CFLAGS := -DDEBUG

# EXTRA_AFLAGS := -DDEBUG

# ccflags-y := -DDEBUG

# asflags-y := -DDEBUG



KBUILD_AFLAGS	:=$(KBUILD_AFLAGS:-msoft-float=-Wa,-mfpu=softvfp+vfp)

LDFLAGS		+=--no-warn-mismatch

arch/h8300/boot/compressed/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
#



targets		:= vmlinux vmlinux.bin vmlinux.bin.gz head.o misc.o piggy.o

EXTRA_AFLAGS	:= -traditional

asflags-y	:= -traditional



OBJECTS = $(obj)/head.o $(obj)/misc.o

arch/ia64/kvm/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -45,8 +45,8 @@ FORCE : $(obj)/$(offsets-file) 
# Makefile for Kernel-based Virtual Machine module

#



EXTRA_CFLAGS += -Ivirt/kvm -Iarch/ia64/kvm/

EXTRA_AFLAGS += -Ivirt/kvm -Iarch/ia64/kvm/

ccflags-y := -Ivirt/kvm -Iarch/ia64/kvm/

asflags-y := -Ivirt/kvm -Iarch/ia64/kvm/



common-objs = $(addprefix ../../../virt/kvm/, kvm_main.o ioapic.o \

		coalesced_mmio.o irq_comm.o assigned-dev.o)

arch/ia64/sn/kernel/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 
# Copyright (C) 1999,2001-2006,2008 Silicon Graphics, Inc.  All Rights Reserved.

#



EXTRA_CFLAGS += -Iarch/ia64/sn/include

ccflags-y := -Iarch/ia64/sn/include



obj-y				+= setup.o bte.o bte_error.o irq.o mca.o idle.o \

				   huberror.o io_acpi_init.o io_common.o \