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

Commit 5c282e85 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 fixes from Hans-Christian Egtvedt.

Fix build warnings and use the Kbuild infrastructure for generic headers
rather than doing it by hand.

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/egtvedt/linux-avr32:
  avr32: cast syscall_return to silence compiler warning
  avr32: fix clockevents kernel warning
  avr32: use Kbuild infrastructure to handle the asm-generic headers
parents 8945546d 395e73a2

arch/avr32/include/asm/Kbuild

+15 −1
Original line number Diff line number Diff line 


generic-y	+= clkdev.h

generic-y       += cputime.h

generic-y       += delay.h

generic-y       += device.h

generic-y       += div64.h

generic-y       += emergency-restart.h

generic-y	+= exec.h

generic-y	+= trace_clock.h

generic-y       += futex.h

generic-y       += irq_regs.h

generic-y	+= param.h

generic-y       += local.h

generic-y       += local64.h

generic-y       += percpu.h

generic-y       += scatterlist.h

generic-y       += sections.h

generic-y       += topology.h

generic-y	+= trace_clock.h

generic-y       += xor.h

arch/avr32/include/asm/cputime.h

deleted100644 → 0
+0 −6
Original line number Diff line number Diff line 
#ifndef __ASM_AVR32_CPUTIME_H

#define __ASM_AVR32_CPUTIME_H



#include <asm-generic/cputime.h>



#endif /* __ASM_AVR32_CPUTIME_H */

arch/avr32/include/asm/delay.h

deleted100644 → 0
+0 −1
Original line number Diff line number Diff line 
#include <asm-generic/delay.h>

arch/avr32/include/asm/device.h

deleted100644 → 0
+0 −7
Original line number Diff line number Diff line 
/*

 * Arch specific extensions to struct device

 *

 * This file is released under the GPLv2

 */

#include <asm-generic/device.h>

arch/avr32/include/asm/div64.h

deleted100644 → 0
+0 −6
Original line number Diff line number Diff line 
#ifndef __ASM_AVR32_DIV64_H

#define __ASM_AVR32_DIV64_H



#include <asm-generic/div64.h>



#endif /* __ASM_AVR32_DIV64_H */