Pull m68k updates from Geert Uytterhoeven. Fix up trivial conflict (m68k switched to generic version of uapi/asm/socket.h, net tree updated the old one) as per Geert. * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k: m68k/sun3: Fix instruction faults m68k/sun3: Get interrupts working again m68k: move to a single instance of free_initmem() m68k: merge MMU and non-MMU versions of mm/init.c m68k: switch to using the asm-generic termios.h m68k: switch to using the asm-generic termbits.h m68k: switch to using the asm-generic sockios.h m68k: switch to using the asm-generic socket.h m68k: switch to using the asm-generic shmbuf.h m68k: switch to using the asm-generic sembuf.h m68k: switch to using the asm-generic msgbuf.h m68k: switch to using the asm-generic auxvec.h m68k: switch to using the asm-generic shmparam.h m68k: switch to using the asm-generic spinlock.h m68k: switch to using the asm-generic hw_irq.h arch/m68k: remove CONFIG_EXPERIMENTAL
		
			
				
	
	
		
			34 lines
		
	
	
	
		
			770 B
			
		
	
	
	
		
			Makefile
		
	
	
	
	
	
			
		
		
	
	
			34 lines
		
	
	
	
		
			770 B
			
		
	
	
	
		
			Makefile
		
	
	
	
	
	
 | 
						|
generic-y += bitsperlong.h
 | 
						|
generic-y += clkdev.h
 | 
						|
generic-y += cputime.h
 | 
						|
generic-y += device.h
 | 
						|
generic-y += emergency-restart.h
 | 
						|
generic-y += errno.h
 | 
						|
generic-y += exec.h
 | 
						|
generic-y += futex.h
 | 
						|
generic-y += hw_irq.h
 | 
						|
generic-y += ioctl.h
 | 
						|
generic-y += ipcbuf.h
 | 
						|
generic-y += irq_regs.h
 | 
						|
generic-y += kdebug.h
 | 
						|
generic-y += kmap_types.h
 | 
						|
generic-y += kvm_para.h
 | 
						|
generic-y += local64.h
 | 
						|
generic-y += local.h
 | 
						|
generic-y += mman.h
 | 
						|
generic-y += mutex.h
 | 
						|
generic-y += percpu.h
 | 
						|
generic-y += resource.h
 | 
						|
generic-y += scatterlist.h
 | 
						|
generic-y += sections.h
 | 
						|
generic-y += shmparam.h
 | 
						|
generic-y += siginfo.h
 | 
						|
generic-y += spinlock.h
 | 
						|
generic-y += statfs.h
 | 
						|
generic-y += termios.h
 | 
						|
generic-y += topology.h
 | 
						|
generic-y += trace_clock.h
 | 
						|
generic-y += types.h
 | 
						|
generic-y += word-at-a-time.h
 | 
						|
generic-y += xor.h
 |