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

Commit b68c5f54 authored by Jeff Garzik's avatar Jeff Garzik
Browse files

Merge branch 'master' into upstream

parents b0fea350 95064a75

Makefile

+1 −1
Original line number Diff line number Diff line 
VERSION = 2

PATCHLEVEL = 6

SUBLEVEL = 18

EXTRAVERSION = -rc6

EXTRAVERSION = -rc7

NAME=Crazed Snow-Weasel



# *DOCUMENTATION*

arch/i386/kernel/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -39,7 +39,6 @@ obj-$(CONFIG_VM86) += vm86.o 
obj-$(CONFIG_EARLY_PRINTK)	+= early_printk.o

obj-$(CONFIG_HPET_TIMER) 	+= hpet.o

obj-$(CONFIG_K8_NB)		+= k8.o

obj-$(CONFIG_AUDIT)		+= audit.o



EXTRA_AFLAGS   := -traditional

arch/ia64/Kconfig

+4 −0
Original line number Diff line number Diff line
@@ -75,6 +75,10 @@ config DMA_IS_NORMAL 
	depends on IA64_SGI_SN2

	default y



config AUDIT_ARCH

	bool

	default y



choice

	prompt "System type"

	default IA64_GENERIC

arch/powerpc/Kconfig

+4 −0
Original line number Diff line number Diff line
@@ -95,6 +95,10 @@ config GENERIC_TBSYNC 
	default y if PPC32 && SMP

	default n



config AUDIT_ARCH

	bool

	default y



config DEFAULT_UIMAGE

	bool

	help

arch/s390/Kconfig

+4 −0
Original line number Diff line number Diff line
@@ -118,6 +118,10 @@ config SYSVIPC_COMPAT 
	depends on COMPAT && SYSVIPC

	default y



config AUDIT_ARCH

	bool

	default y



comment "Code generation options"



choice