Commit graph

337 commits

Author SHA1 Message Date
Ben Hutchings
740f50083f Merge /dists/sid/linux-2.6 (2.6.32-13).
svn path=/dists/trunk/linux-2.6/; revision=15735
2010-05-18 02:17:18 +00:00
Maximilian Attems
163c21ff1f readd openvz in small dose
still disabled and without patch,
but makes it easier for me to test against latest sid.

svn path=/dists/sid/linux-2.6/; revision=15384
2010-03-16 00:11:09 +00:00
Bastian Blank
6d22c311fe debian/config/amd64/xen/defines, debian/config/i386/xen/defines:
Build as plain images.

svn path=/dists/sid/linux-2.6/; revision=15293
2010-02-28 18:40:23 +00:00
Maximilian Attems
59dfd89bbc cleanup trunk from openvz references
no patch forcoming, no schedule for a patch.
thus no openvz bannana for squeeze.

svn path=/dists/trunk/linux-2.6/; revision=14991
2010-01-24 12:08:42 +00:00
Bastian Blank
6154bd8f7a * debian/config/amd64/config.amd64: Remove empty file.
* debian/config/amd64/defines, debian/config/i386/defines:
  Update config file selection.
* debian/config/kernelarch-x86/config-arch-64:
  Merge missing arch specific stuff.

svn path=/dists/trunk/linux-2.6/; revision=14494
2009-10-29 10:52:17 +00:00
Bastian Blank
5424d006b0 * debian/config/amd64/config, debian/config/i386/config:
Remove empty files.
* debian/config/amd64/defines, debian/config/i386/defines:
  Update config file selection.
* debian/config/kernelarch-x86/config,
  debian/config/kernelarch-x86/config-arch-32,
  debian/config/kernelarch-x86/config-arch-64:
  Merge missing arch specific stuff.

svn path=/dists/trunk/linux-2.6/; revision=14493
2009-10-29 10:50:03 +00:00
Bastian Blank
dfeae13097 debian/config/amd64/config, debian/config/i386/config,
debian/config/kernelarch-x86: Move options.

svn path=/dists/trunk/linux-2.6/; revision=14488
2009-10-29 09:38:10 +00:00
Bastian Blank
a3634c7e99 debian/config/amd64/config, debian/config/i386/config,
debian/config/kernelarch-x86/config: Move options.

svn path=/dists/trunk/linux-2.6/; revision=14487
2009-10-29 09:34:47 +00:00
Bastian Blank
0cce6432ab debian/config: Reorder.
svn path=/dists/trunk/linux-2.6/; revision=14486
2009-10-29 09:31:47 +00:00
Bastian Blank
e39e268dbd Move all description related config options into its own section.
* debian/bin/gencontrol.py: Handle description parts.
* debian/config: Update.
* debian/lib/python/debian_linux/config.py: Recognize new section.
* debian/lib/python/debian_linux/gencontrol.py: Remove old code.

svn path=/dists/trunk/linux-2.6/; revision=14469
2009-10-27 16:35:16 +00:00
Bastian Blank
4f7ca7019c debian/config: Reorder.
svn path=/dists/trunk/linux-2.6/; revision=14435
2009-10-23 16:26:40 +00:00
Ben Hutchings
e775ea3ceb Improve package descriptions
- Clarify the differences between i386 flavours (Closes: #414690)
- Simplify wording of the description template

svn path=/dists/trunk/linux-2.6/; revision=14342
2009-10-06 23:26:20 +00:00
Maximilian Attems
632e764400 config nuke oss remenants
svn path=/dists/trunk/linux-2.6/; revision=14306
2009-09-26 15:25:31 +00:00
Maximilian Attems
e15d96e07c centralize hamradio drivers
just keep the isa ones from the topconfig..

svn path=/dists/trunk/linux-2.6/; revision=14305
2009-09-26 14:23:13 +00:00
Maximilian Attems
17eb34ffd3 Revert "disable oldstyle pc speaker driver"
as bwh says people prefer old style "beep" then alsa dev.

This reverts commit 539d94a775c27eddd9cdc35ceef869ed01080cb5.

svn path=/dists/trunk/linux-2.6/; revision=14085
2009-08-05 13:56:58 +00:00
Maximilian Attems
dc018a6dd7 disable oldstyle pc speaker driver
as we now have one under alsa.

svn path=/dists/trunk/linux-2.6/; revision=14080
2009-08-03 13:47:08 +00:00
Maximilian Attems
d22061fc5a x86 enable EDAC_AMD64
centralize the x86 edac settings as bonus.

svn path=/dists/trunk/linux-2.6/; revision=13970
2009-07-18 16:00:31 +00:00
Maximilian Attems
c5d75909f8 x86 enable modular ACERHDF
centralize x86 platform drivers, just one is not x86_64.

svn path=/dists/trunk/linux-2.6/; revision=13967
2009-07-18 15:48:53 +00:00
Maximilian Attems
b1e93ff564 x86 enable COMEDI_PCMCIA_DRIVERS
centralize the comedi staging setting.

svn path=/dists/trunk/linux-2.6/; revision=13964
2009-07-18 15:48:27 +00:00
Maximilian Attems
8ebaba191b x86 centralize HW_RANDOM
as bonus side effects enables now also HW_RANDOM_VIA,
which got 64 bit clean.

svn path=/dists/trunk/linux-2.6/; revision=13950
2009-07-16 13:50:38 +00:00
Bastian Blank
c50195c654 debian/config/amd64/defines, debian/config/i386/defines:
Mark amd64 kernels als Xen capable.

svn path=/dists/trunk/linux-2.6/; revision=13787
2009-06-12 17:38:02 +00:00
Bastian Blank
8e1bb416a5 * debian/changelog: Update.
* debian/config: Always enable NETCONSOLE.

svn path=/dists/trunk/linux-2.6/; revision=13778
2009-06-10 22:05:48 +00:00
Bastian Blank
b2e9653d3a debian/config: Centralize CPU Frequency scaling options.
svn path=/dists/trunk/linux-2.6/; revision=13773
2009-06-10 19:08:41 +00:00
Bastian Blank
2addd9ca6a debian/config: Centralize Input device support.
svn path=/dists/trunk/linux-2.6/; revision=13770
2009-06-10 11:47:08 +00:00
Bastian Blank
c36203b790 * debian/changelog: Update.
* debian/config: Centralize Power Management.

svn path=/dists/trunk/linux-2.6/; revision=13766
2009-06-10 11:23:15 +00:00
Bastian Blank
b6a7f6750a debian/config/amd64/config, debian/config/kernelarch-x86/config-arch-64:
Move options.

svn path=/dists/trunk/linux-2.6/; revision=13765
2009-06-10 11:17:20 +00:00
Bastian Blank
6531948445 debian/config/amd64/config, debian/config/i386/config,
debian/config/kernelarch-x86: Move options.

svn path=/dists/trunk/linux-2.6/; revision=13764
2009-06-10 11:15:08 +00:00
Bastian Blank
9125b997aa debian/config/amd64/config, debian/config/i386/config,
debian/config/kernelarch-x86: Move options.

svn path=/dists/trunk/linux-2.6/; revision=13763
2009-06-10 11:09:58 +00:00
Bastian Blank
4e70a560e3 * debian/changelog: Update.
* debian/config: Centralize sound core.

svn path=/dists/trunk/linux-2.6/; revision=13761
2009-06-10 10:55:38 +00:00
Bastian Blank
721910c76d * debian/changelog: Update.
* debian/config/alpha/config, debian/config/amd64/config,
  debian/config/i386/config, debian/config/ia64/config: Disable SOUND_PRIME.

svn path=/dists/trunk/linux-2.6/; revision=13756
2009-06-10 10:37:34 +00:00
Maximilian Attems
48c9524efc clean up old config options step 3
- x86: allow more than 8 cpus to be used on 32-bit
  4272ebfbefd0db40073f3ee5990bceaf2894f08b

- [CPUFREQ] powernow-k8: Always compile powernow-k8 driver with ACPI
  support
  57f4fa699195b761cbea90db5e38b4bc15610c7c

- x86: rename X86_GENERICARCH to X86_32_NON_STANDARD
  e0c7ae376a13fd79a4dad8becab51040d13dfa90

- x86: remove the Voyager 32-bit subarch
  965c7ecaf2e2b083d711a01ab33735a4bdeee1a4

- ALSA: cs4236: cs4232 and cs4236 driver merge to solve PnP BIOS
  detection
  c2b73d1458014a9f461b75bc1756a699a6c0781f

- [WATCHDOG] wdt.c: remove #ifdef CONFIG_WDT_501
  04bedfa542d90ac7a1bbf28287e9861d0da21576

svn path=/dists/trunk/linux-2.6/; revision=13682
2009-05-27 11:24:19 +00:00
Maximilian Attems
b62cfba977 clean up old config options step 2
- igb: remove LRO Kconfig option
  5fbbcb79e5371d99565826a352c1003d0f1f0678

- HID: remove compat stuff
  afa5eb7c68689ced4284f01c96feed44a2d0a127

- cfg80211/nl80211: remove usage of CONFIG_NL80211
  633e24ed95b6c87b42f201ecb65c12a75a5a7eef

- tridentfb: delete acceleration Kconfig option
  04645fc337eef283887d3b1204017f1860ed2ff7

- ide: merge ide_arm and ide_generic host drivers
  4465461ece2b9249d6c0cf57bc0002100823e361

svn path=/dists/trunk/linux-2.6/; revision=13681
2009-05-27 11:24:16 +00:00
Maximilian Attems
30ec9c6b05 clean up old config options step 1
- VIDEO_SAA7111 and VIDEO_SAA7114 gone
  see 107063c6156a0cbf055e771baafc28a3e3c0fb9b

- USB: remove phidget drivers from kernel tree.
  see 77aa2b5878f48d6ab6e0c412cc9214c845483475

- USB: serial: rename cp2101 driver to cp210x
  see 03ee251546a9360cbb4c27c250d128dcbcfd9931

- SUNRPC: Remove CONFIG_SUNRPC_REGISTER_V4

- md: remove CONFIG_MD_RAID_RESHAPE config option.

- fbdev: remove cyblafb driver

svn path=/dists/trunk/linux-2.6/; revision=13680
2009-05-27 11:24:09 +00:00
Bastian Blank
6df9474554 * debian/config/amd64/config, debian/config/i386/config:
Remove Xen options.
* debian/config/kernelarch-x86/config: Add Xen options.

svn path=/dists/trunk/linux-2.6/; revision=13655
2009-05-20 15:52:55 +00:00
Bastian Blank
034bb3ebf2 * debian/config/amd64/config: Remove ACPI options.
* debian/config/kernelarch-x86/config: Add ACPI options.

svn path=/dists/trunk/linux-2.6/; revision=13646
2009-05-20 14:27:52 +00:00
Bastian Blank
6933957588 * debian/config/amd64/config.amd64: Remove options.
* debian/config/kernelarch-x86/config-arch-64: Add further options.

svn path=/dists/trunk/linux-2.6/; revision=13645
2009-05-20 14:24:12 +00:00
Bastian Blank
91447d2bbc * debian/config/amd64/config.amd64: Remove options.
* debian/config/kernelarch-x86/config-arch-64: Add further options.

svn path=/dists/trunk/linux-2.6/; revision=13643
2009-05-20 14:18:10 +00:00
Bastian Blank
7a37133cb9 * debian/config/amd64/config: Remove some options.
* debian/config/amd64/defines: Include new config files.
* debian/config/kernelarch-x86: New directory.
* debian/config/kernelarch-x86/config: Add x86 generic options.
* debian/config/kernelarch-x86/config-arch-64: Add x86 64bit options.

svn path=/dists/trunk/linux-2.6/; revision=13642
2009-05-20 14:13:39 +00:00
Bastian Blank
6b04bc7ea5 debian/config: Reorder.
svn path=/dists/trunk/linux-2.6/; revision=13641
2009-05-20 13:20:19 +00:00
Maximilian Attems
da261d6b58 x86 enable DMAR
disable DMAR_DEFAULT_ON, intel_iommu=on bootparam is needed
to have it enabled. KMS guys will easily find out.

seen same optionset in fedora.

Reported-by: Julien Cristau <jcristau@debian.org>

svn path=/dists/trunk/linux-2.6/; revision=13579
2009-05-06 12:05:07 +00:00
Maximilian Attems
0f020a324d topconfig enable PAT
was disabled for lenny due beeing crashy at first,
but should have stabilised since.

svn path=/dists/trunk/linux-2.6/; revision=13578
2009-05-06 11:55:04 +00:00
Maximilian Attems
bbfc9ff0ff topconfig centralize modular MTD_NAND_NANDSIM
seems that drivers/mtd resisted centralisation yet,
mostly disabled just strange deviation on alpha.

"we already have it for NOR flash with CONFIG_MTD_RAM,
 but we don't have it for NAND flash with CONFIG_MTD_NAND_NANDSIM
 the use case is for people like me who have some ubifs
 volumes to work with on both NOR and NAND flashes outside the target
 machine."

Reported-by: Aurélien Gérôme <ag@debian.org>

svn path=/dists/trunk/linux-2.6/; revision=13577
2009-05-06 11:48:35 +00:00
Maximilian Attems
d2abec6d02 x86 set modular EDAC_AMD8111
svn path=/dists/trunk/linux-2.6/; revision=13574
2009-05-05 13:46:18 +00:00
Maximilian Attems
b050ac084f x86 set modular EDAC_AMD8131
svn path=/dists/trunk/linux-2.6/; revision=13573
2009-05-05 13:46:14 +00:00
Maximilian Attems
1527ff028f x86_64 enable modular CRYPTO_AES_NI_INTEL
svn path=/dists/trunk/linux-2.6/; revision=13572
2009-05-05 13:46:11 +00:00
Maximilian Attems
f3fbb8d860 x86 set DELL_WMI
svn path=/dists/trunk/linux-2.6/; revision=13568
2009-05-05 13:45:59 +00:00
Maximilian Attems
f100842100 topconfig centralize 3Dfx fb options
alpha strangely enabled the accel option that no one else did,
most probably an oversight.
set te new FB_3DFX_I2C support.

svn path=/dists/trunk/linux-2.6/; revision=13567
2009-05-05 13:45:55 +00:00
Maximilian Attems
1b2feb1a1b x86 explicitly disable THINKPAD_ACPI_UNSAFE_LEDS
defaults to no and states
"Never enable this option on a distribution kernel"..

svn path=/dists/trunk/linux-2.6/; revision=13554
2009-05-04 13:08:01 +00:00
Maximilian Attems
05532c1f47 x86 disable COMEDI_DEBUG
this beast is not set anywhere else..

svn path=/dists/trunk/linux-2.6/; revision=13552
2009-05-04 13:07:47 +00:00
Maximilian Attems
2553102449 centralize JOYSTICK_IFORCE settings
was the last remaining joystick driver not in topconfig.

svn path=/dists/trunk/linux-2.6/; revision=13185
2009-03-20 16:49:23 +00:00