CVS: linux MAINTAINERS,1.3,1.4 Makefile,1.3,1.4

Brad Boyer <[email protected]> Mon, 28 Apr 2003 23:39:05 -0700
Newsgroups	gmane.linux.file-systems.hfsplus.cvs
Message-ID	<[email protected]>
Update of /cvsroot/linux-hfsplus/linux
In directory sc8-pr-cvs1:/tmp/cvs-serv30627

Modified Files:
	MAINTAINERS Makefile 
Log Message:
Merged 2.4.19 to 2.4.21 changes


Index: MAINTAINERS
===================================================================
RCS file: /cvsroot/linux-hfsplus/linux/MAINTAINERS,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** MAINTAINERS	8 May 2002 03:01:27 -0000	1.3
--- MAINTAINERS	29 Apr 2003 06:38:31 -0000	1.4
***************
*** 1,2 ****
--- 1,3 ----
+ 	
  	List of maintainers and how to submit kernel changes
  
***************
*** 90,93 ****
--- 91,100 ----
  S:	Maintained
  
+ 3CR990 NETWORK DRIVER
+ P:	David Dillow
+ M:	[email protected]
+ L:	[email protected]
+ S:	Maintained
+ 
  53C700 AND 53C700-66 SCSI DRIVER
  P:	James E.J. Bottomley
***************
*** 104,113 ****
  8139CP 10/100 FAST ETHERNET DRIVER
  P:	Jeff Garzik
! M:	[email protected]
  S:	Maintained
  
  8139TOO 10/100 FAST ETHERNET DRIVER
  P:	Jeff Garzik
! M:	[email protected]
  W:	http://sourceforge.net/projects/gkernel/
  S:	Maintained
--- 111,120 ----
  8139CP 10/100 FAST ETHERNET DRIVER
  P:	Jeff Garzik
! M:	[email protected]
  S:	Maintained
  
  8139TOO 10/100 FAST ETHERNET DRIVER
  P:	Jeff Garzik
! M:	[email protected]
  W:	http://sourceforge.net/projects/gkernel/
  S:	Maintained
***************
*** 154,157 ****
--- 161,172 ----
  S:	Supported
  
+ AACRAID SCSI RAID DRIVER
+ P:	Adaptec OEM Raid Solutions
+ M:	[email protected]
+ L:	[email protected]
+ L:	[email protected]
+ W:	http://domsch.com/linux
+ S:	Supported
+ 
  ACPI
  P:	Andy Grover
***************
*** 192,195 ****
--- 207,217 ----
  S:	Maintained
  
+ ALTERA EPXA1/EPXA10 DEVELOPMENT BOARD PORT
+ P:	Clive Davies
+ M:	[email protected]
+ L:	[email protected]
+ W:      http://www.arm.linux.org.uk/
+ S:	Maintained
+ 
  APM DRIVER
  P:	Stephen Rothwell
***************
*** 210,213 ****
--- 232,242 ----
  S:	Maintained
  
+ ARM/PT DIGITAL BOARD PORT
+ P:	Stefan Eletzhofer
+ M:	[email protected]
+ L:	[email protected]
+ W:	http://www.arm.linux.org.uk/
+ S:	Maintained
+ 
  ARM/SHARK MACHINE SUPPORT
  P:	Alexander Schulz
***************
*** 229,232 ****
--- 258,268 ----
  S:	Maintained
  
+ ATM
+ P:	Chas Williams
+ M:	[email protected]
+ L:	[email protected]
+ W:	http://linux-atm.sourceforge.net
+ S:	Maintained
+ 
  AX.25 NETWORK LAYER
  P:	Matthias Welwarsky
***************
*** 242,245 ****
--- 278,287 ----
  S:	Maintained
  
+ BEFS FILE SYSTEM
+ P:	Will Dyson
+ M:	[email protected]
+ W:	http://befs-driver.sourceforge.net/
+ S:	Maintained
+ 
  BERKSHIRE PRODUCTS PC WATCHDOG DRIVER
  P:	Kenji Hollis
***************
*** 267,270 ****
--- 309,327 ----
  S:	Maintained
  
+ BLUETOOTH SUBSYSTEM (PC Card Drivers)
+ P:	Marcel Holtmann
+ M:	[email protected]
+ W:	http://www.holtmann.org/linux/bluetooth/
+ S:	Maintained
+ 
+ BONDING DRIVER
+ P:   Chad Tindel
+ M:   [email protected]
+ P:   Jay Vosburgh
+ M:   [email protected]
+ L:   [email protected]
+ W:   http://sourceforge.net/projects/bonding/
+ S:   Supported
+ 
  BTTV VIDEO4LINUX DRIVER
  P:	Gerd Knorr
***************
*** 274,287 ****
  S:	Maintained
  
- BUSLOGIC SCSI DRIVER
- P:	Leonard N. Zubkoff
- M:	Leonard N. Zubkoff <[email protected]>
- L:	[email protected]
- W:	http://www.dandelion.com/Linux/
- S:	Maintained
- 
  CIRRUS LOGIC GENERIC FBDEV DRIVER
  P:	Jeff Garzik
! M:	[email protected]
  L:	[email protected]
  S:	Odd Fixes
--- 331,337 ----
  S:	Maintained
  
  CIRRUS LOGIC GENERIC FBDEV DRIVER
  P:	Jeff Garzik
! M:	[email protected]
  L:	[email protected]
  S:	Odd Fixes
***************
*** 302,324 ****
  S:	Maintained
  
! COMPAQ FIBRE CHANNEL 64-bit/66MHz PCI non-intelligent HBA
! P:      Amy Vanzant-Hodge 
! M:      Amy Vanzant-Hodge ([email protected])
! L:	[email protected]
! W:	ftp.compaq.com/pub/products/drivers/linux
! S:      Supported
  
! COMPAQ SMART2 RAID DRIVER
! P:	Charles White	
! M:	Charles White <[email protected]>
! L:	[email protected]
! W:	ftp.compaq.com/pub/products/drivers/linux
! S:	Supported	
! 
! COMPAQ SMART CISS RAID DRIVER 
! P:	Charles White
! M:	Charles White <[email protected]>
! L:	[email protected]
! W:	ftp.compaq.com/pub/products/drivers/linux	
  S:	Supported 
  
--- 352,374 ----
  S:	Maintained
  
! HP (was COMPAQ) FIBRE CHANNEL 64-bit/66MHz PCI non-intelligent HBA
! P:      Stephen Cameron
! M:      [email protected] 
! M:      [email protected]
! L:	[email protected]
! S:      Odd Fixes
! 
! HP (was COMPAQ) SMART2 RAID DRIVER
! P:	Stephen Cameron
! M:	[email protected]
! M:	[email protected]
! L:	[email protected]
! S:	Odd Fixes
  
! HP (was COMPAQ) SMART CISS RAID DRIVER 
! P:	Stephen Cameron
! M:	[email protected]
! M:	[email protected]
! L:	[email protected]
  S:	Supported 
  
***************
*** 530,535 ****
  P:	Rui Sousa	
  M:	[email protected]	
! L:	[email protected]
! W:	http://opensource.creative.com/
  S:	Maintained
  
--- 580,585 ----
  P:	Rui Sousa	
  M:	[email protected]	
! L:	[email protected]
! W:	http://sourceforge.net/projects/emu10k1/
  S:	Maintained
  
***************
*** 627,632 ****
  
  HFS FILESYSTEM
! P:      Adrian Sun
! M:      [email protected]
  L:      [email protected]
  S:      Maintained
--- 677,682 ----
  
  HFS FILESYSTEM
! P:      Oliver Neukum
! M:      [email protected]
  L:      [email protected]
  S:      Maintained
***************
*** 680,684 ****
  i386 BOOT CODE
  P:	Riley H. Williams
! M:	[email protected]
  L:	[email protected]
  S:	Maintained
--- 730,734 ----
  i386 BOOT CODE
  P:	Riley H. Williams
! M:	[email protected]
  L:	[email protected]
  S:	Maintained
***************
*** 704,707 ****
--- 754,764 ----
  S:	Maintained
  
+ SN-IA64 (Itanium) SUB-PLATFORM
+ P:	John Hesterberg
+ M:	[email protected]
+ L:	[email protected]
+ W:	http://www.sgi.com/altix
+ S:	Maintained
+ 
  IBM MCA SCSI SUBSYSTEM DRIVER
  P:	Michael Lang
***************
*** 711,716 ****
  
  IBM ServeRAID RAID DRIVER
! P:      Keith Mitchell
! M:      [email protected]
  W:      http://www.developer.ibm.com/welcome/netfinity/serveraid.html
  S:      Supported 
--- 768,775 ----
  
  IBM ServeRAID RAID DRIVER
! P:      Jack Hammer
! M:      [email protected]
! P:      David Jeffery
! M:      [email protected]
  W:      http://www.developer.ibm.com/welcome/netfinity/serveraid.html
  S:      Supported 
***************
*** 784,788 ****
  INTEL I8XX RANDOM NUMBER GENERATOR SUPPORT
  P:	Jeff Garzik
! M:	[email protected]
  W:	http://sourceforge.net/projects/gkernel/
  S:	Maintained
--- 843,847 ----
  INTEL I8XX RANDOM NUMBER GENERATOR SUPPORT
  P:	Jeff Garzik
! M:	[email protected]
  W:	http://sourceforge.net/projects/gkernel/
  S:	Maintained
***************
*** 793,796 ****
--- 852,863 ----
  S:	Maintained
  
+ INTEL PRO/1000 GIGABIT ETHERNET SUPPORT
+ P:	Jeb Cramer
+ M:	[email protected]
+ P:	Scott Feldman
+ M:	[email protected]
+ W:	http://sourceforge.net/projects/e1000/
+ S:	Supported
+ 
  INTERMEZZO FILE SYSTEM
  P:	Peter J. Braam
***************
*** 803,807 ****
  P:	Ralf Baechle
  M:	[email protected]
! L:	[email protected]
  S:	Maintained
  
--- 870,874 ----
  P:	Ralf Baechle
  M:	[email protected]
! L:	[email protected]
  S:	Maintained
  
***************
*** 859,862 ****
--- 926,936 ----
  S:	Maintained
  
+ JFS FILESYSTEM
+ P:	Dave Kleikamp
+ M:	[email protected]
+ L:	[email protected]
+ W:	http://oss.software.ibm.com/developerworks/opensource/jfs/
+ S:	Supported
+ 
  JOYSTICK DRIVER
  P:	Vojtech Pavlik
***************
*** 1008,1012 ****
  M:	[email protected]
  W:	http://oss.sgi.com/mips/mips-howto.html
! L:	[email protected]
  S:	Maintained
  
--- 1082,1086 ----
  M:	[email protected]
  W:	http://oss.sgi.com/mips/mips-howto.html
! L:	[email protected]
  S:	Maintained
  
***************
*** 1026,1029 ****
--- 1100,1109 ----
  S:	Maintained
  
+ MOTION EYE VAIO PICTUREBOOK CAMERA DRIVER
+ P:	Stelian Pop
+ M:	[email protected]
+ W:	http://popies.net/meye/
+ S:	Maintained
+ 
  MOUSE AND MISC DEVICES [GENERAL]
  P:	Alessandro Rubini
***************
*** 1063,1080 ****
  S:	Maintained
  
! NETFILTER
  P:	Rusty Russell
- M:	[email protected]
  P:	Marc Boucher
- M:	[email protected]
  P:	James Morris
- M:	[email protected]
  P:	Harald Welte
- M:	[email protected]
  P:	Jozsef Kadlecsik
! M:	[email protected]
  W:	http://www.netfilter.org/
  W:	http://www.iptables.org/
! L:	[email protected]
  S:	Supported
  
--- 1143,1157 ----
  S:	Maintained
  
! NETFILTER/IPTABLES
  P:	Rusty Russell
  P:	Marc Boucher
  P:	James Morris
  P:	Harald Welte
  P:	Jozsef Kadlecsik
! M:	[email protected]
  W:	http://www.netfilter.org/
  W:	http://www.iptables.org/
! L:	[email protected]
! L:	[email protected]
  S:	Supported
  
***************
*** 1094,1098 ****
  M:	[email protected]
  P:	Jeff Garzik
! M:	[email protected]
  L:	[email protected]
  S:	Maintained
--- 1171,1175 ----
  M:	[email protected]
  P:	Jeff Garzik
! M:	[email protected]
  L:	[email protected]
  S:	Maintained
***************
*** 1102,1106 ****
  M:	[email protected]
  L:	[email protected]
- W:	http://www.uk.linux.org/NetNews.html (2.0 only)
  S:	Maintained
  
--- 1179,1182 ----
***************
*** 1108,1117 ****
  P:	David S. Miller
  M:	[email protected]
- P:	Andi Kleen
- M:	[email protected]
  P:	Alexey Kuznetsov
  M:	[email protected]
  P:	Pekka Savola (ipv6)
  M:	[email protected]
  L:	[email protected]
  S:	Maintained
--- 1184,1193 ----
  P:	David S. Miller
  M:	[email protected]
  P:	Alexey Kuznetsov
  M:	[email protected]
  P:	Pekka Savola (ipv6)
  M:	[email protected]
+ P:	James Morris
+ M:	[email protected]
  L:	[email protected]
  S:	Maintained
***************
*** 1136,1139 ****
--- 1212,1223 ----
  S:	Maintained
  
+ NINJA SCSI-32Bi/UDE PCI/CARDBUS SCSI HOST ADAPTER DRIVER
+ P:	GOTO Masanori
+ M:	[email protected]
+ P:	YOKOTA Hiroshi
+ M:	[email protected]
+ W:	http://www.netlab.is.tsukuba.ac.jp/~yokota/izumi/ninja/
+ S:	Maintained
+ 
  NON-IDE/NON-SCSI CDROM DRIVERS [GENERAL] (come on, crew - mark your responsibility)
  P:	Eberhard Moenkeberg
***************
*** 1151,1156 ****
  NVIDIA (RIVA) FRAMEBUFFER DRIVER
  P:	Ani Joshi
! M:	[email protected]
! L:	[email protected]
  S:	Maintained
  
--- 1235,1240 ----
  NVIDIA (RIVA) FRAMEBUFFER DRIVER
  P:	Ani Joshi
! M:	[email protected]
! L:      [email protected]
  S:	Maintained
  
***************
*** 1178,1181 ****
--- 1262,1271 ----
  S:	Maintained
  
+ ORINOCO DRIVER
+ P:	David Gibson
+ M:	[email protected]
+ W:	http://www.ozlabs.org/people/dgibson/dldwd
+ S:	Maintained
+ 
  PARALLEL PORT SUPPORT
  P:	Phil Blundell
***************
*** 1237,1241 ****
  PCMCIA SUBSYSTEM
  P:	David Hinds
! M:	[email protected]
  L:	[email protected]
  W:	http://pcmcia-cs.sourceforge.net
--- 1327,1331 ----
  PCMCIA SUBSYSTEM
  P:	David Hinds
! M:	[email protected]
  L:	[email protected]
  W:	http://pcmcia-cs.sourceforge.net
***************
*** 1248,1263 ****
  S:	Maintained
  
  PHILIPS NINO PALM PC
  P:	Steven Hill
  M:	[email protected]
! L:	[email protected]
  W:	http://www.realitydiluted.com/projects/nino
  S:	Maintained
  
! PERMEDIA 3 FRAMEBUFFER DRIVER
! P:	Romain Dolbeau
! M:	[email protected]
! L:	[email protected]
! W:	http://www.irisa.fr/prive/dolbeau/pm3fb/pm3fb.html
  S:	Maintained
  
--- 1338,1360 ----
  S:	Maintained
  
+ PERMEDIA 3 FRAMEBUFFER DRIVER
+ P:	Romain Dolbeau
+ M:	[email protected]
+ L:	[email protected]
+ W:	http://www.irisa.fr/prive/dolbeau/pm3fb/pm3fb.html
+ S:	Maintained
+ 
  PHILIPS NINO PALM PC
  P:	Steven Hill
  M:	[email protected]
! L:	[email protected]
  W:	http://www.realitydiluted.com/projects/nino
  S:	Maintained
  
! PHILIPS NINO PALM PC
! P:	Steven Hill
! M:	[email protected]
! L:	[email protected]
! W:	http://www.realitydiluted.com/projects/nino
  S:	Maintained
  
***************
*** 1270,1273 ****
--- 1367,1379 ----
  S:	Maintained
  
+ POWERVR2 FRAMEBUFFER DRIVER
+ P:	M. R. Brown
+ M:	[email protected]
+ P:	Paul Mundt
+ M:	[email protected]
+ L:	[email protected]
+ W:	http://www.linuxdc.org
+ S:	Maintained
+ 
  PPP PROTOCOL DRIVERS AND COMPRESSORS
  P:	Paul Mackerras
***************
*** 1301,1305 ****
  RADEON FRAMEBUFFER DISPLAY DRIVER
  P:	Ani Joshi
! M:	[email protected]
  L:      [email protected]
  S:      Maintained
--- 1407,1411 ----
  RADEON FRAMEBUFFER DISPLAY DRIVER
  P:	Ani Joshi
! M:	[email protected]
  L:      [email protected]
  S:      Maintained
***************
*** 1307,1311 ****
  RAGE128 FRAMEBUFFER DISPLAY DRIVER
  P:	Ani Joshi
! M:	[email protected]
  L:	[email protected]
  S:	Maintained
--- 1413,1417 ----
  RAGE128 FRAMEBUFFER DISPLAY DRIVER
  P:	Ani Joshi
! M:	[email protected]
  L:	[email protected]
  S:	Maintained
***************
*** 1342,1345 ****
--- 1448,1457 ----
  S:	Maintained
  
+ RME96XX MULTICHANNEL SOUND DRIVER
+ P:	Guenter Geiger
+ M:	[email protected]  
+ L:	[email protected]
+ S:	Maintained
+ 
  RTLINUX  REALTIME  LINUX
  P:	Victor Yodaiken
***************
*** 1360,1364 ****
  P:	Nicolas Pitre
  M:	[email protected]
! L:	[email protected]
  S:	Maintained
  
--- 1472,1476 ----
  P:	Nicolas Pitre
  M:	[email protected]
! L:	[email protected]
  S:	Maintained
  
***************
*** 1369,1372 ****
--- 1481,1489 ----
  S:	Maintained
  
+ SC1200 WDT DRIVER
+ P:      Zwane Mwaikambo
+ M:      [email protected]
+ S:      Maintained
+ 
  SCSI CDROM DRIVER
  P:	Jens Axboe
***************
*** 1393,1396 ****
--- 1510,1519 ----
  S:	Maintained
  
+ SCx200 CPU SUPPORT
+ P:	Christer Weinigel
+ M:	[email protected]
+ W:	http://www.weinigel.se
+ S:	Supported
+ 
  SGI VISUAL WORKSTATION 320 AND 540
  P:	Bent Hagemark
***************
*** 1441,1444 ****
--- 1564,1573 ----
  S:	Maintained
  
+ SONY VAIO CONTROL DEVICE DRIVER
+ P:	Stelian Pop
+ M:	[email protected]
+ W:	http://popies.net/sonypi/
+ S:	Maintained
+ 
  SOUND
  P:	Alan Cox
***************
*** 1446,1450 ****
  S:	Maintained for 2.2 only
  
! SPARC:
  P:	David S. Miller
  M:	[email protected]
--- 1575,1579 ----
  S:	Maintained for 2.2 only
  
! UltraSPARC (sparc64):
  P:	David S. Miller
  M:	[email protected]
***************
*** 1459,1462 ****
--- 1588,1595 ----
  S:	Maintained
  
+ SPARC (sparc32):
+ L:	[email protected]
+ S:	Unmaintained - please send patches to mailing list
+ 
  SPECIALIX IO8+ MULTIPORT SERIAL CARD DRIVER
  P:	Roger Wolff
***************
*** 1509,1512 ****
--- 1642,1652 ----
  S:	Maintained
  
+ SUPERH WATCHDOG
+ P:	Paul Mundt
+ M:	[email protected]
+ L:	[email protected]
+ W:	http://www.linuxsh.org
+ S:	Maintained
+ 
  SVGA HANDLING
  P:	Martin Mares
***************
*** 1515,1518 ****
--- 1655,1664 ----
  S:	Maintained
  
+ SYSKONNECT DRIVER
+ P: Mirko Lindner
+ M: [email protected]
+ W: http://www.syskonnect.com
+ S: Supported
+ 
  SYSV FILESYSTEM
  P:	Christoph Hellwig
***************
*** 1520,1523 ****
--- 1666,1695 ----
  S:	Maintained
  
+ TI GRAPH LINK USB (SilverLink) CABLE DRIVER
+ P:      Romain Lievin
+ M:      [email protected]
+ P:      Julien Blache
+ M:      [email protected]
+ S:      Maintained
+ 
+ TI PARALLEL LINK CABLE DRIVER
+ P:     Romain Lievin
+ M:     [email protected]
+ S:     Maintained
+ 
+ TIEMAN VOYAGER USB BRAILLE DISPLAY DRIVER
+ P:	Stephane Dalton
+ M:	[email protected]
+ P:	Stéphane Doyon
+ M:	[email protected]
+ S:	Maintained
+ 
+ TIEMAN VOYAGER USB BRAILLE DISPLAY DRIVER
+ P:	Stephane Dalton
+ M:	[email protected]
+ P:	Stéphane Doyon
+ M:	[email protected]
+ S:	Maintained
+ 
  TLAN NETWORK DRIVER
  P:	Samuel Chessman
***************
*** 1557,1561 ****
  TULIP NETWORK DRIVER
  P:	Jeff Garzik
! M:	[email protected]
  L:	[email protected]
  W:	http://sourceforge.net/projects/tulip/
--- 1729,1733 ----
  TULIP NETWORK DRIVER
  P:	Jeff Garzik
! M:	[email protected]
  L:	[email protected]
  W:	http://sourceforge.net/projects/tulip/
***************
*** 1607,1611 ****
  USB AUERSWALD DRIVER
  P:	Wolfgang Muees
! M:	[email protected]
  L:	[email protected]
  L:	[email protected]
--- 1779,1783 ----
  USB AUERSWALD DRIVER
  P:	Wolfgang Muees
! M:	[email protected]
  L:	[email protected]
  L:	[email protected]
***************
*** 1621,1629 ****
  
  USB CDC ETHERNET DRIVER
! P:	Brad Hards
! M:	[email protected]
  L:	[email protected]
  L:	[email protected]
  S:	Maintained
  
  USB EHCI DRIVER
--- 1793,1802 ----
  
  USB CDC ETHERNET DRIVER
! P:	Greg Kroah-Hartman
! M:	[email protected]
  L:	[email protected]
  L:	[email protected]
  S:	Maintained
+ W:	http://www.kroah.com/linux-usb/
  
  USB EHCI DRIVER
***************
*** 1699,1702 ****
--- 1872,1883 ----
  S:	Maintained
  
+ USB SCANNER DRIVER
+ P:	Henning Meier-Geinitz
+ M:	[email protected]
+ L:	[email protected]
+ L:	[email protected]
+ W:	http://www.meier-geinitz.de/kernel/
+ S:	Maintained
+ 
  USB SE401 DRIVER
  P:	Jeroen Vreeken
***************
*** 1786,1789 ****
--- 1967,1975 ----
  S:	Odd fixes
  
+ VIA RHINE NETWORK DRIVER
+ P:	Roger Luethi
+ M:	[email protected]
+ S:	Maintained
+ 
  USB DIAMOND RIO500 DRIVER
  P:	Cesar Miquel
***************
*** 1796,1800 ****
  P:	Gerd Knorr
  M:	[email protected]
- W:	http://roadrunner.swansea.linux.org.uk/v4l.shtml
  S:	Maintained
  
--- 1982,1985 ----
***************
*** 1827,1830 ****
--- 2012,2022 ----
  P:	Ingo Molnar
  M:	[email protected]
+ S:	Maintained
+ 
+ X86-64 port
+ P:	Andi Kleen
+ M:	[email protected]
+ L:	[email protected]
+ W:	http://www.x86-64.org
  S:	Maintained
  

Index: Makefile
===================================================================
RCS file: /cvsroot/linux-hfsplus/linux/Makefile,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** Makefile	8 May 2002 03:01:27 -0000	1.3
--- Makefile	29 Apr 2003 06:38:31 -0000	1.4
***************
*** 1,5 ****
  VERSION = 2
  PATCHLEVEL = 4
! SUBLEVEL = 19
  EXTRAVERSION = -hfsplus
  
--- 1,5 ----
  VERSION = 2
  PATCHLEVEL = 4
! SUBLEVEL = 21
  EXTRAVERSION = -hfsplus
  
***************
*** 138,143 ****
  	drivers/block/block.o \
  	drivers/misc/misc.o \
! 	drivers/net/net.o \
! 	drivers/media/media.o
  DRIVERS-$(CONFIG_AGP) += drivers/char/agp/agp.o
  DRIVERS-$(CONFIG_DRM_NEW) += drivers/char/drm/drm.o
--- 138,142 ----
  	drivers/block/block.o \
  	drivers/misc/misc.o \
! 	drivers/net/net.o
  DRIVERS-$(CONFIG_AGP) += drivers/char/agp/agp.o
  DRIVERS-$(CONFIG_DRM_NEW) += drivers/char/drm/drm.o
***************
*** 171,175 ****
  DRIVERS-$(CONFIG_ZORRO) += drivers/zorro/driver.o
  DRIVERS-$(CONFIG_FC4) += drivers/fc4/fc4.a
! DRIVERS-$(CONFIG_PPC) += drivers/macintosh/macintosh.o
  DRIVERS-$(CONFIG_MAC) += drivers/macintosh/macintosh.o
  DRIVERS-$(CONFIG_ISAPNP) += drivers/pnp/pnp.o
--- 170,174 ----
  DRIVERS-$(CONFIG_ZORRO) += drivers/zorro/driver.o
  DRIVERS-$(CONFIG_FC4) += drivers/fc4/fc4.a
! DRIVERS-$(CONFIG_PPC32) += drivers/macintosh/macintosh.o
  DRIVERS-$(CONFIG_MAC) += drivers/macintosh/macintosh.o
  DRIVERS-$(CONFIG_ISAPNP) += drivers/pnp/pnp.o
***************
*** 180,184 ****
--- 179,185 ----
  DRIVERS-$(CONFIG_TC) += drivers/tc/tc.a
  DRIVERS-$(CONFIG_USB) += drivers/usb/usbdrv.o
+ DRIVERS-y +=drivers/media/media.o
  DRIVERS-$(CONFIG_INPUT) += drivers/input/inputdrv.o
+ DRIVERS-$(CONFIG_HIL) += drivers/hil/hil.o
  DRIVERS-$(CONFIG_I2O) += drivers/message/i2o/i2o.o
  DRIVERS-$(CONFIG_IRDA) += drivers/net/irda/irda.o
***************
*** 186,189 ****
--- 187,191 ----
  DRIVERS-$(CONFIG_PHONE) += drivers/telephony/telephony.o
  DRIVERS-$(CONFIG_MD) += drivers/md/mddev.o
+ DRIVERS-$(CONFIG_GSC) += drivers/gsc/gscbus.o
  DRIVERS-$(CONFIG_BLUEZ) += drivers/bluetooth/bluetooth.o
  DRIVERS-$(CONFIG_HOTPLUG_PCI) += drivers/hotplug/vmlinux-obj.o
***************
*** 259,263 ****
  # then your code is broken!  KAO.
  
! kbuild_2_4_nostdinc	:= -nostdinc $(shell $(CC) -print-search-dirs | sed -ne 's/install: \(.*\)/-I \1include/gp')
  export kbuild_2_4_nostdinc
  
--- 261,265 ----
  # then your code is broken!  KAO.
  
! kbuild_2_4_nostdinc	:= -nostdinc -iwithprefix include
  export kbuild_2_4_nostdinc
  
***************
*** 325,347 ****
  	@mv -f .tmpversion .version
  
  include/linux/compile.h: $(CONFIGURATION) include/linux/version.h newversion
! 	@echo -n \#define UTS_VERSION \"\#`cat .version` > .ver
! 	@if [ -n "$(CONFIG_SMP)" ] ; then echo -n " SMP" >> .ver; fi
! 	@if [ -f .name ]; then  echo -n \-`cat .name` >> .ver; fi
! 	@echo ' '`date`'"' >> .ver
! 	@echo \#define LINUX_COMPILE_TIME \"`date +%T`\" >> .ver
  	@echo \#define LINUX_COMPILE_BY \"`whoami`\" >> .ver
! 	@echo \#define LINUX_COMPILE_HOST \"`hostname`\" >> .ver
! 	@if [ -x /bin/dnsdomainname ]; then \
! 	   echo \#define LINUX_COMPILE_DOMAIN \"`dnsdomainname`\"; \
! 	 elif [ -x /bin/domainname ]; then \
! 	   echo \#define LINUX_COMPILE_DOMAIN \"`domainname`\"; \
! 	 else \
! 	   echo \#define LINUX_COMPILE_DOMAIN ; \
! 	 fi >> .ver
  	@echo \#define LINUX_COMPILER \"`$(CC) $(CFLAGS) -v 2>&1 | tail -1`\" >> .ver
  	@mv -f .ver $@
  
  include/linux/version.h: ./Makefile
  	@echo \#define UTS_RELEASE \"$(KERNELRELEASE)\" > .ver
  	@echo \#define LINUX_VERSION_CODE `expr $(VERSION) \\* 65536 + $(PATCHLEVEL) \\* 256 + $(SUBLEVEL)` >> .ver
--- 327,353 ----
  	@mv -f .tmpversion .version
  
+ uts_len		:= 64
+ uts_truncate	:= sed -e 's/\(.\{1,$(uts_len)\}\).*/\1/'
+ 
  include/linux/compile.h: $(CONFIGURATION) include/linux/version.h newversion
! 	@echo -n \#`cat .version` > .ver1
! 	@if [ -n "$(CONFIG_SMP)" ] ; then echo -n " SMP" >> .ver1; fi
! 	@if [ -f .name ]; then  echo -n \-`cat .name` >> .ver1; fi
! 	@LANG=C echo ' '`date` >> .ver1
! 	@echo \#define UTS_VERSION \"`cat .ver1 | $(uts_truncate)`\" > .ver
! 	@LANG=C echo \#define LINUX_COMPILE_TIME \"`date +%T`\" >> .ver
  	@echo \#define LINUX_COMPILE_BY \"`whoami`\" >> .ver
! 	@echo \#define LINUX_COMPILE_HOST \"`hostname | $(uts_truncate)`\" >> .ver
! 	@([ -x /bin/dnsdomainname ] && /bin/dnsdomainname > .ver1) || \
! 	 ([ -x /bin/domainname ] && /bin/domainname > .ver1) || \
! 	 echo > .ver1
! 	@echo \#define LINUX_COMPILE_DOMAIN \"`cat .ver1 | $(uts_truncate)`\" >> .ver
  	@echo \#define LINUX_COMPILER \"`$(CC) $(CFLAGS) -v 2>&1 | tail -1`\" >> .ver
  	@mv -f .ver $@
+ 	@rm -f .ver1
  
  include/linux/version.h: ./Makefile
+ 	@expr length "$(KERNELRELEASE)" \<= $(uts_len) > /dev/null || \
+ 	  (echo KERNELRELEASE \"$(KERNELRELEASE)\" exceeds $(uts_len) characters >&2; false)
  	@echo \#define UTS_RELEASE \"$(KERNELRELEASE)\" > .ver
  	@echo \#define LINUX_VERSION_CODE `expr $(VERSION) \\* 65536 + $(PATCHLEVEL) \\* 256 + $(SUBLEVEL)` >> .ver
***************
*** 355,362 ****
  
  init/main.o: init/main.c include/config/MARKER
! 	$(CC) $(CFLAGS) $(CFLAGS_KERNEL) $(PROFILING) -DKBUILD_BASENAME=$(subst $(comma),_,$(subst -,_,$(*F))) -c -o $*.o $<
  
  init/do_mounts.o: init/do_mounts.c include/config/MARKER
! 	$(CC) $(CFLAGS) $(CFLAGS_KERNEL) $(PROFILING) -DKBUILD_BASENAME=$(subst $(comma),_,$(subst -,_,$(*F))) -c -o $*.o $<
  
  fs lib mm ipc kernel drivers net: dummy
--- 361,368 ----
  
  init/main.o: init/main.c include/config/MARKER
! 	$(CC) $(CFLAGS) $(CFLAGS_KERNEL) $(PROFILING) -DKBUILD_BASENAME=$(subst $(comma),_,$(subst -,_,$(*F))) -c -o $@ $<
  
  init/do_mounts.o: init/do_mounts.c include/config/MARKER
! 	$(CC) $(CFLAGS) $(CFLAGS_KERNEL) $(PROFILING) -DKBUILD_BASENAME=$(subst $(comma),_,$(subst -,_,$(*F))) -c -o $@ $<
  
  fs lib mm ipc kernel drivers net: dummy
***************
*** 364,370 ****
  
  TAGS: dummy
! 	etags `find include/asm-$(ARCH) -name '*.h'`
! 	find include -type d \( -name "asm-*" -o -name config \) -prune -o -name '*.h' -print | xargs etags -a
! 	find $(SUBDIRS) init -name '*.[ch]' | xargs etags -a
  
  # Exuberant ctags works better with -I
--- 370,376 ----
  
  TAGS: dummy
! 	{ find include/asm-${ARCH} -name '*.h' -print ; \
! 	find include -type d \( -name "asm-*" -o -name config \) -prune -o -name '*.h' -print ; \
! 	find $(SUBDIRS) init arch/${ARCH} -name '*.[chS]' ; } | grep -v SCCS | grep -v '\.svn' | etags -
  
  # Exuberant ctags works better with -I
***************
*** 483,492 ****
  
  dep-files: scripts/mkdep archdep include/linux/version.h
! 	scripts/mkdep -- init/*.c > .depend
! 	scripts/mkdep -- `find $(FINDHPATH) -name SCCS -prune -o -follow -name \*.h ! -name modversions.h -print` > .hdepend
  	$(MAKE) $(patsubst %,_sfdep_%,$(SUBDIRS)) _FASTDEP_ALL_SUB_DIRS="$(SUBDIRS)"
  ifdef CONFIG_MODVERSIONS
  	$(MAKE) update-modverfile
  endif
  
  ifdef CONFIG_MODVERSIONS
--- 489,499 ----
  
  dep-files: scripts/mkdep archdep include/linux/version.h
! 	rm -f .depend .hdepend
  	$(MAKE) $(patsubst %,_sfdep_%,$(SUBDIRS)) _FASTDEP_ALL_SUB_DIRS="$(SUBDIRS)"
  ifdef CONFIG_MODVERSIONS
  	$(MAKE) update-modverfile
  endif
+ 	scripts/mkdep -- `find $(FINDHPATH) \( -name SCCS -o -name .svn \) -prune -o -follow -name \*.h ! -name modversions.h -print` > .hdepend
+ 	scripts/mkdep -- init/*.c > .depend
  
  ifdef CONFIG_MODVERSIONS



-------------------------------------------------------
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf