Linux v3.5-8197-g2e3ee61
This commit is contained in:
parent
79b876cd70
commit
baa249360d
@ -62,7 +62,7 @@ Summary: The Linux kernel
|
||||
# For non-released -rc kernels, this will be appended after the rcX and
|
||||
# gitX tags, so a 3 here would become part of release "0.rcX.gitX.3"
|
||||
#
|
||||
%global baserelease 2
|
||||
%global baserelease 1
|
||||
%global fedora_build %{baserelease}
|
||||
|
||||
# base_sublevel is the kernel version we're starting with and patching
|
||||
@ -95,7 +95,7 @@ Summary: The Linux kernel
|
||||
# The rc snapshot level
|
||||
%define rcrev 0
|
||||
# The git snapshot level
|
||||
%define gitrev 5
|
||||
%define gitrev 6
|
||||
# Set rpm version accordingly
|
||||
%define rpmversion 3.%{upstream_sublevel}.0
|
||||
%endif
|
||||
@ -2288,6 +2288,9 @@ fi
|
||||
# ||----w |
|
||||
# || ||
|
||||
%changelog
|
||||
* Tue Jul 31 2012 Josh Boyer <jwboyer@redhat.com> - 3.6.0-0.rc0.git6.1
|
||||
- Linux v3.5-8197-g2e3ee61
|
||||
|
||||
* Wed Jul 31 2012 John W. Linville <linville@redhat.com>
|
||||
- Enable batman-adv and add it to the list of "extra" modules
|
||||
|
||||
|
@ -4795,16 +4795,17 @@ index 3071fe8..38233b6 100644
|
||||
-
|
||||
-}
|
||||
diff --git a/arch/m68k/Kconfig b/arch/m68k/Kconfig
|
||||
index 1471201..3694301 100644
|
||||
index 0b0f8b8..fcc5a65 100644
|
||||
--- a/arch/m68k/Kconfig
|
||||
+++ b/arch/m68k/Kconfig
|
||||
@@ -11,6 +11,9 @@ config M68K
|
||||
select GENERIC_STRNLEN_USER if MMU
|
||||
@@ -12,6 +12,10 @@ config M68K
|
||||
select FPU if MMU
|
||||
select ARCH_WANT_IPC_PARSE_VERSION
|
||||
select ARCH_USES_GETTIMEOFFSET if MMU && !COLDFIRE
|
||||
+ select HAVE_MOD_ARCH_SPECIFIC
|
||||
+ select MODULES_USE_ELF_REL
|
||||
+ select MODULES_USE_ELF_RELA
|
||||
+
|
||||
|
||||
config RWSEM_GENERIC_SPINLOCK
|
||||
bool
|
||||
|
Loading…
Reference in New Issue
Block a user