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

Commit 101b82f5 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/egtvedt/linux-avr32 

Pull AVR32 update from Hans-Christian Egtvedt:
 "wow, it has gone 10 releases since my last request :("

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/egtvedt/linux-avr32:
  avr32: fix building warnings caused by redefinitions of HZ
  avr32: fix relocation check for signed 18-bit offset
  avr32: move NODES_SHIFT into Kconfig and delete numnodes.h
parents 3cb7a59f 0c9b5a31

arch/avr32/Kconfig

+5 −0
Original line number Diff line number Diff line
@@ -205,6 +205,11 @@ config ARCH_DISCONTIGMEM_ENABLE 
config ARCH_SPARSEMEM_ENABLE

	def_bool n



config NODES_SHIFT

	int

	default "2"

	depends on NEED_MULTIPLE_NODES



source "mm/Kconfig"



config OWNERSHIP_TRACE

arch/avr32/include/asm/Kbuild

+1 −0
Original line number Diff line number Diff line
@@ -2,3 +2,4 @@ 
generic-y	+= clkdev.h

generic-y	+= exec.h

generic-y	+= trace_clock.h

generic-y	+= param.h

arch/avr32/include/asm/numnodes.h

deleted100644 → 0
+0 −7
Original line number Diff line number Diff line 
#ifndef __ASM_AVR32_NUMNODES_H

#define __ASM_AVR32_NUMNODES_H



/* Max 4 nodes */

#define NODES_SHIFT	2



#endif /* __ASM_AVR32_NUMNODES_H */

arch/avr32/include/asm/param.h

deleted100644 → 0
+0 −9
Original line number Diff line number Diff line 
#ifndef __ASM_AVR32_PARAM_H

#define __ASM_AVR32_PARAM_H



#include <uapi/asm/param.h>



# define HZ		CONFIG_HZ

# define USER_HZ	100		/* User interfaces are in "ticks" */

# define CLOCKS_PER_SEC	(USER_HZ)	/* frequency at which times() counts */

#endif /* __ASM_AVR32_PARAM_H */

arch/avr32/include/uapi/asm/Kbuild

+1 −0
Original line number Diff line number Diff line
@@ -33,3 +33,4 @@ header-y += termbits.h 
header-y += termios.h

header-y += types.h

header-y += unistd.h

generic-y += param.h