aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAurelien Jarno <aurel32@debian.org>2013-05-30 09:45:43 +0000
committerAurelien Jarno <aurel32@debian.org>2013-05-30 09:45:43 +0000
commit8e28f834dd9805a0eab7a560aaf8a95620d5297a (patch)
tree672190851e7a8a959e2bdf254c0b45ecd82f0dbe
parent2c7f332bc53f34b015522ca959b536f0a34a1a7d (diff)
downloadkernel_replicant_linux-8e28f834dd9805a0eab7a560aaf8a95620d5297a.tar.gz
kernel_replicant_linux-8e28f834dd9805a0eab7a560aaf8a95620d5297a.tar.bz2
kernel_replicant_linux-8e28f834dd9805a0eab7a560aaf8a95620d5297a.zip
* [mips] Enable KEXEC.
svn path=/dists/sid/linux/; revision=20149
-rw-r--r--debian/changelog3
-rw-r--r--debian/config/mips/config1
-rw-r--r--debian/config/mips/config.4kc-malta1
-rw-r--r--debian/config/mips/config.5kc-malta1
4 files changed, 4 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog
index ff0feeb16934..192bcc56954f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -29,6 +29,9 @@ linux (3.9.4-1) UNRELEASED; urgency=low
- [powerpc/powerpc64] Replace ibmvscsic with ibmvscsi in scsi-modules
- [ppc64] Use symlinks to follow powerpc/powerpc64 configuration
+ [ Aurelien Jarno ]
+ * [mips] Enable KEXEC.
+
-- Ben Hutchings <ben@decadent.org.uk> Sun, 19 May 2013 00:26:48 +0100
linux (3.8.13-1) unstable; urgency=low
diff --git a/debian/config/mips/config b/debian/config/mips/config
index 63f3c1bf1a56..e8ef129aeaa0 100644
--- a/debian/config/mips/config
+++ b/debian/config/mips/config
@@ -5,4 +5,5 @@
CONFIG_CPU_BIG_ENDIAN=y
# CONFIG_CPU_LITTLE_ENDIAN is not set
## end choice
+CONFIG_KEXEC=y
# CONFIG_RAPIDIO is not set
diff --git a/debian/config/mips/config.4kc-malta b/debian/config/mips/config.4kc-malta
index a6bd648cbff9..eb93217640b3 100644
--- a/debian/config/mips/config.4kc-malta
+++ b/debian/config/mips/config.4kc-malta
@@ -75,7 +75,6 @@ CONFIG_HZ_250=y
# CONFIG_HZ_1000 is not set
# CONFIG_HZ_1024 is not set
## end choice
-# CONFIG_KEXEC is not set
CONFIG_PCI=y
##
diff --git a/debian/config/mips/config.5kc-malta b/debian/config/mips/config.5kc-malta
index d344716a83b5..f9f6eecb4723 100644
--- a/debian/config/mips/config.5kc-malta
+++ b/debian/config/mips/config.5kc-malta
@@ -75,7 +75,6 @@ CONFIG_HZ_250=y
# CONFIG_HZ_1000 is not set
# CONFIG_HZ_1024 is not set
## end choice
-# CONFIG_KEXEC is not set
CONFIG_PCI=y
CONFIG_MIPS32_COMPAT=y
CONFIG_MIPS32_O32=y