diff options
| author | Ben Hutchings <benh@debian.org> | 2014-06-16 12:24:52 +0000 |
|---|---|---|
| committer | Ben Hutchings <benh@debian.org> | 2014-06-16 12:24:52 +0000 |
| commit | a50e53cccf15983094c416fc51991880e87d2d78 (patch) | |
| tree | 87e3246c1cbfadcf11b66faf5e3f2287041844d3 /debian/config/mips | |
| parent | 88eeb109ecb9bfa1406d9a4e88ba7dbddf990a62 (diff) | |
| parent | f66cd3322f51b30a7c65e5dc2012f5af3f5ee01f (diff) | |
| download | kernel_replicant_linux-a50e53cccf15983094c416fc51991880e87d2d78.tar.gz kernel_replicant_linux-a50e53cccf15983094c416fc51991880e87d2d78.tar.bz2 kernel_replicant_linux-a50e53cccf15983094c416fc51991880e87d2d78.zip | |
Merge changes from sid up to 3.14.7-1
Replace 'powerpc/powernv: Add calls to support little endian host'
with the version committed upstream.
Drop the ABI-preserving changes.
svn path=/dists/trunk/linux/; revision=21452
Diffstat (limited to 'debian/config/mips')
| -rw-r--r-- | debian/config/mips/config.4kc-malta | 5 | ||||
| -rw-r--r-- | debian/config/mips/config.5kc-malta | 5 | ||||
| -rw-r--r-- | debian/config/mips/config.octeon | 1 |
3 files changed, 0 insertions, 11 deletions
diff --git a/debian/config/mips/config.4kc-malta b/debian/config/mips/config.4kc-malta index 3410aace949b..b3cc474d3737 100644 --- a/debian/config/mips/config.4kc-malta +++ b/debian/config/mips/config.4kc-malta @@ -167,11 +167,6 @@ CONFIG_R3964=m CONFIG_APPLICOM=m ## -## file: drivers/char/hw_random/Kconfig -## -CONFIG_HW_RANDOM=m - -## ## file: drivers/char/ipmi/Kconfig ## CONFIG_IPMI_HANDLER=m diff --git a/debian/config/mips/config.5kc-malta b/debian/config/mips/config.5kc-malta index 83a35a092285..70bda5b9dfac 100644 --- a/debian/config/mips/config.5kc-malta +++ b/debian/config/mips/config.5kc-malta @@ -170,11 +170,6 @@ CONFIG_R3964=m CONFIG_APPLICOM=m ## -## file: drivers/char/hw_random/Kconfig -## -CONFIG_HW_RANDOM=m - -## ## file: drivers/char/ipmi/Kconfig ## CONFIG_IPMI_HANDLER=m diff --git a/debian/config/mips/config.octeon b/debian/config/mips/config.octeon index da9b9f1f93ee..f0273903f5a8 100644 --- a/debian/config/mips/config.octeon +++ b/debian/config/mips/config.octeon @@ -37,7 +37,6 @@ CONFIG_PATA_OCTEON_CF=y ## ## file: drivers/char/hw_random/Kconfig ## -CONFIG_HW_RANDOM=m CONFIG_HW_RANDOM_OCTEON=m ## |