Fri Mar 6 15:09:50 2015 UTC ()
Fix tabbing of drm lines.


(riastradh)
diff -r1.26 -r1.27 src/sys/arch/amd64/conf/ALL
diff -r1.409 -r1.410 src/sys/arch/amd64/conf/GENERIC
cvs diff -r1.26 -r1.27 src/sys/arch/amd64/conf/ALL (expand / switch to unified diff)

--- src/sys/arch/amd64/conf/ALL 2015/03/06 02:55:11 1.26
+++ src/sys/arch/amd64/conf/ALL 2015/03/06 15:09:50 1.27
@@ -1,33 +1,33 @@ @@ -1,33 +1,33 @@
1# $NetBSD: ALL,v 1.26 2015/03/06 02:55:11 riastradh Exp $ 1# $NetBSD: ALL,v 1.27 2015/03/06 15:09:50 riastradh Exp $
2# From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp 2# From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp
3# 3#
4# ALL machine description file 4# ALL machine description file
5# 5#
6# This machine description includes all devices and options and it is 6# This machine description includes all devices and options and it is
7# used to compile-test the source and does not necessarily produce a 7# used to compile-test the source and does not necessarily produce a
8# bootable or useful kernel. 8# bootable or useful kernel.
9# 9#
10# For further information on hardware support for this architecture, see 10# For further information on hardware support for this architecture, see
11# the intro(4) man page. For further information about kernel options 11# the intro(4) man page. For further information about kernel options
12# for this architecture, see the options(4) man page. For an explanation 12# for this architecture, see the options(4) man page. For an explanation
13# of each device driver in this file see the section 4 man page for the 13# of each device driver in this file see the section 4 man page for the
14# device. 14# device.
15 15
16include "arch/amd64/conf/std.amd64" 16include "arch/amd64/conf/std.amd64"
17 17
18options INCLUDE_CONFIG_FILE # embed config file in kernel binary 18options INCLUDE_CONFIG_FILE # embed config file in kernel binary
19 19
20#ident "ALL-$Revision: 1.26 $" 20#ident "ALL-$Revision: 1.27 $"
21 21
22maxusers 64 # estimated number of users 22maxusers 64 # estimated number of users
23 23
24makeoptions USE_SSP=yes 24makeoptions USE_SSP=yes
25 25
26# CPU-related options. 26# CPU-related options.
27#options VM86 # virtual 8086 emulation 27#options VM86 # virtual 8086 emulation
28#options USER_LDT # user-settable LDT; used by WINE 28#options USER_LDT # user-settable LDT; used by WINE
29options X86EMU # 386 Real Mode emulator 29options X86EMU # 386 Real Mode emulator
30#options PAE # PAE mode (36 bits physical addressing) 30#options PAE # PAE mode (36 bits physical addressing)
31 31
32# CPU features 32# CPU features
33acpicpu* at cpu? # ACPI CPU (including frequency scaling) 33acpicpu* at cpu? # ACPI CPU (including frequency scaling)
@@ -516,30 +516,30 @@ wsdisplay* at wsemuldisplaydev? @@ -516,30 +516,30 @@ wsdisplay* at wsemuldisplaydev?
516# DRI legacy drivers 516# DRI legacy drivers
517#i915drm* at drm? # Intel i915, i945 DRM driver 517#i915drm* at drm? # Intel i915, i945 DRM driver
518#mach64drm* at drm? # mach64 (3D Rage Pro, Rage) DRM driver 518#mach64drm* at drm? # mach64 (3D Rage Pro, Rage) DRM driver
519#mgadrm* at drm? # Matrox G[24]00, G[45]50 DRM driver 519#mgadrm* at drm? # Matrox G[24]00, G[45]50 DRM driver
520#r128drm* at drm? # ATI Rage 128 DRM driver 520#r128drm* at drm? # ATI Rage 128 DRM driver
521#radeondrm* at drm? # ATI Radeon DRM driver 521#radeondrm* at drm? # ATI Radeon DRM driver
522#savagedrm* at drm? # S3 Savage DRM driver 522#savagedrm* at drm? # S3 Savage DRM driver
523#sisdrm* at drm? # SiS DRM driver 523#sisdrm* at drm? # SiS DRM driver
524#tdfxdrm* at drm? # 3dfx (voodoo) DRM driver 524#tdfxdrm* at drm? # 3dfx (voodoo) DRM driver
525#vboxdrm* at drm? # VirtualBox DRM driver 525#vboxdrm* at drm? # VirtualBox DRM driver
526#viadrm* at drm? # VIA UniChrome DRM driver 526#viadrm* at drm? # VIA UniChrome DRM driver
527 527
528# DRMKMS drivers 528# DRMKMS drivers
529i915drmkms* at pci? dev ? function ? 529i915drmkms* at pci? dev ? function ?
530intelfb* at intelfbbus? 530intelfb* at intelfbbus?
531 531
532radeon* at pci? dev ? function ? 532radeon* at pci? dev ? function ?
533radeondrmkmsfb* at radeonfbbus? 533radeondrmkmsfb* at radeonfbbus?
534 534
535nouveau* at pci? dev ? function ? 535nouveau* at pci? dev ? function ?
536nouveaufb* at nouveaufbbus? 536nouveaufb* at nouveaufbbus?
537 537
538attimer0 at isa? 538attimer0 at isa?
539pcppi0 at isa? 539pcppi0 at isa?
540sysbeep0 at pcppi? 540sysbeep0 at pcppi?
541 541
542# Serial Devices 542# Serial Devices
543 543
544# PCI serial interfaces 544# PCI serial interfaces
545com* at puc? port ? # 16x50s on "universal" comm boards 545com* at puc? port ? # 16x50s on "universal" comm boards
cvs diff -r1.409 -r1.410 src/sys/arch/amd64/conf/GENERIC (expand / switch to unified diff)

--- src/sys/arch/amd64/conf/GENERIC 2015/03/06 02:55:11 1.409
+++ src/sys/arch/amd64/conf/GENERIC 2015/03/06 15:09:50 1.410
@@ -1,38 +1,38 @@ @@ -1,38 +1,38 @@
1# $NetBSD: GENERIC,v 1.409 2015/03/06 02:55:11 riastradh Exp $ 1# $NetBSD: GENERIC,v 1.410 2015/03/06 15:09:50 riastradh Exp $
2# 2#
3# GENERIC machine description file 3# GENERIC machine description file
4# 4#
5# This machine description file is used to generate the default NetBSD 5# This machine description file is used to generate the default NetBSD
6# kernel. The generic kernel does not include all options, subsystems 6# kernel. The generic kernel does not include all options, subsystems
7# and device drivers, but should be useful for most applications. 7# and device drivers, but should be useful for most applications.
8# 8#
9# The machine description file can be customised for your specific 9# The machine description file can be customised for your specific
10# machine to reduce the kernel size and improve its performance. 10# machine to reduce the kernel size and improve its performance.
11# 11#
12# For further information on compiling NetBSD kernels, see the config(8) 12# For further information on compiling NetBSD kernels, see the config(8)
13# man page. 13# man page.
14# 14#
15# For further information on hardware support for this architecture, see 15# For further information on hardware support for this architecture, see
16# the intro(4) man page. For further information about kernel options 16# the intro(4) man page. For further information about kernel options
17# for this architecture, see the options(4) man page. For an explanation 17# for this architecture, see the options(4) man page. For an explanation
18# of each device driver in this file see the section 4 man page for the 18# of each device driver in this file see the section 4 man page for the
19# device. 19# device.
20 20
21include "arch/amd64/conf/std.amd64" 21include "arch/amd64/conf/std.amd64"
22 22
23options INCLUDE_CONFIG_FILE # embed config file in kernel binary 23options INCLUDE_CONFIG_FILE # embed config file in kernel binary
24 24
25#ident "GENERIC-$Revision: 1.409 $" 25#ident "GENERIC-$Revision: 1.410 $"
26 26
27maxusers 64 # estimated number of users 27maxusers 64 # estimated number of users
28 28
29# delay between "rebooting ..." message and hardware reset, in milliseconds 29# delay between "rebooting ..." message and hardware reset, in milliseconds
30#options CPURESET_DELAY=2000 30#options CPURESET_DELAY=2000
31 31
32# This option allows you to force a serial console at the specified 32# This option allows you to force a serial console at the specified
33# I/O address. see console(4) for details. 33# I/O address. see console(4) for details.
34#options CONSDEVNAME="\"com\"",CONADDR=0x2f8,CONSPEED=57600 34#options CONSDEVNAME="\"com\"",CONADDR=0x2f8,CONSPEED=57600
35# you don't want the option below ON iff you are using the 35# you don't want the option below ON iff you are using the
36# serial console option of the new boot strap code. 36# serial console option of the new boot strap code.
37#options CONS_OVERRIDE # Always use above! independent of boot info 37#options CONS_OVERRIDE # Always use above! independent of boot info
38 38
@@ -399,30 +399,30 @@ sysbeep0 at pcppi? @@ -399,30 +399,30 @@ sysbeep0 at pcppi?
399 399
400# DRI legacy drivers 400# DRI legacy drivers
401#i915drm* at drm? # Intel i915, i945 DRM driver 401#i915drm* at drm? # Intel i915, i945 DRM driver
402#mach64drm* at drm? # mach64 (3D Rage Pro, Rage) DRM driver 402#mach64drm* at drm? # mach64 (3D Rage Pro, Rage) DRM driver
403#mgadrm* at drm? # Matrox G[24]00, G[45]50 DRM driver 403#mgadrm* at drm? # Matrox G[24]00, G[45]50 DRM driver
404#r128drm* at drm? # ATI Rage 128 DRM driver 404#r128drm* at drm? # ATI Rage 128 DRM driver
405#radeondrm* at drm? # ATI Radeon DRM driver 405#radeondrm* at drm? # ATI Radeon DRM driver
406#savagedrm* at drm? # S3 Savage DRM driver 406#savagedrm* at drm? # S3 Savage DRM driver
407#sisdrm* at drm? # SiS DRM driver 407#sisdrm* at drm? # SiS DRM driver
408#tdfxdrm* at drm? # 3dfx (voodoo) DRM driver 408#tdfxdrm* at drm? # 3dfx (voodoo) DRM driver
409#viadrm* at drm? # VIA DRM driver 409#viadrm* at drm? # VIA DRM driver
410 410
411# DRMKMS drivers 411# DRMKMS drivers
412i915drmkms* at pci? dev ? function ? 412i915drmkms* at pci? dev ? function ?
413intelfb* at intelfbbus? 413intelfb* at intelfbbus?
414 414
415radeon* at pci? dev ? function ? 415radeon* at pci? dev ? function ?
416radeondrmkmsfb* at radeonfbbus? 416radeondrmkmsfb* at radeonfbbus?
417 417
418#nouveau* at pci? dev ? function ? 418#nouveau* at pci? dev ? function ?
419#nouveaufb* at nouveaufbbus? 419#nouveaufb* at nouveaufbbus?
420 420
421# Cryptographic Devices 421# Cryptographic Devices
422 422
423# PCI cryptographic devices 423# PCI cryptographic devices
424hifn* at pci? dev ? function ? # Hifn 7755/7811/795x 424hifn* at pci? dev ? function ? # Hifn 7755/7811/795x
425ubsec* at pci? dev ? function ? # Broadcom 5501/5601/580x/582x 425ubsec* at pci? dev ? function ? # Broadcom 5501/5601/580x/582x
426 426
427# Trusted Platform Module 427# Trusted Platform Module
428tpm* at isa? iomem 0xfed40000 irq 7 428tpm* at isa? iomem 0xfed40000 irq 7