*** empty log message ***

5 files changed, 473 insertions, 164 deletions

diff --git a/sys-kernel/linux-bootdisk/files/2.4.1_pre8/autoconf.h b/sys-kernel/linux-bootdisk/files/2.4.1_pre8/autoconf.h
index 5624e5873a4f..9c7f6042d6ad 100644
--- a/sys-kernel/linux-bootdisk/files/2.4.1_pre8/autoconf.h
+++ b/sys-kernel/linux-bootdisk/files/2.4.1_pre8/autoconf.h
@@ -72,8 +72,15 @@
 #define CONFIG_PCI_NAMES 1
 #undef  CONFIG_EISA
 #undef  CONFIG_MCA
-#undef  CONFIG_HOTPLUG
-#undef  CONFIG_PCMCIA
+#define CONFIG_HOTPLUG 1
+
+/*
+ * PCMCIA/CardBus support
+ */
+#define CONFIG_PCMCIA 1
+#define CONFIG_CARDBUS 1
+#define CONFIG_I82365 1
+#undef  CONFIG_TCIC
 #define CONFIG_SYSVIPC 1
 #undef  CONFIG_BSD_PROCESS_ACCT
 #define CONFIG_SYSCTL 1
@@ -106,8 +113,8 @@
 /*
  * Plug and Play configuration
  */
-#undef  CONFIG_PNP
-#undef  CONFIG_ISAPNP
+#define CONFIG_PNP 1
+#define CONFIG_ISAPNP 1
 
 /*
  * Block devices
@@ -116,8 +123,11 @@
 #undef  CONFIG_BLK_DEV_XD
 #undef  CONFIG_PARIDE
 #undef  CONFIG_BLK_CPQ_DA
+#define CONFIG_BLK_CPQ_DA_MODULE 1
 #undef  CONFIG_BLK_CPQ_CISS_DA
+#define CONFIG_BLK_CPQ_CISS_DA_MODULE 1
 #undef  CONFIG_BLK_DEV_DAC960
+#define CONFIG_BLK_DEV_DAC960_MODULE 1
 #define CONFIG_BLK_DEV_LOOP 1
 #undef  CONFIG_BLK_DEV_NBD
 #define CONFIG_BLK_DEV_RAM 1
@@ -127,14 +137,20 @@
 /*
  * Multi-device support (RAID and LVM)
  */
-#undef  CONFIG_MD
+#define CONFIG_MD 1
 #undef  CONFIG_BLK_DEV_MD
+#define CONFIG_BLK_DEV_MD_MODULE 1
 #undef  CONFIG_MD_LINEAR
+#define CONFIG_MD_LINEAR_MODULE 1
 #undef  CONFIG_MD_RAID0
+#define CONFIG_MD_RAID0_MODULE 1
 #undef  CONFIG_MD_RAID1
+#define CONFIG_MD_RAID1_MODULE 1
 #undef  CONFIG_MD_RAID5
+#define CONFIG_MD_RAID5_MODULE 1
 #undef  CONFIG_BLK_DEV_LVM
-#undef  CONFIG_LVM_PROC_FS
+#define CONFIG_BLK_DEV_LVM_MODULE 1
+#define CONFIG_LVM_PROC_FS 1
 
 /*
  * Networking options
@@ -269,8 +285,11 @@
  * SCSI low-level drivers
  */
 #undef  CONFIG_BLK_DEV_3W_XXXX_RAID
+#define CONFIG_BLK_DEV_3W_XXXX_RAID_MODULE 1
 #undef  CONFIG_SCSI_7000FASST
+#define CONFIG_SCSI_7000FASST_MODULE 1
 #undef  CONFIG_SCSI_ACARD
+#define CONFIG_SCSI_ACARD_MODULE 1
 #define CONFIG_SCSI_AHA152X 1
 #define CONFIG_SCSI_AHA1542 1
 #define CONFIG_SCSI_AHA1740 1
@@ -280,45 +299,94 @@
 #undef  CONFIG_AIC7XXX_PROC_STATS
 #define CONFIG_AIC7XXX_RESET_DELAY (5)
 #undef  CONFIG_SCSI_ADVANSYS
+#define CONFIG_SCSI_ADVANSYS_MODULE 1
 #undef  CONFIG_SCSI_IN2000
+#define CONFIG_SCSI_IN2000_MODULE 1
 #undef  CONFIG_SCSI_AM53C974
-#undef  CONFIG_SCSI_MEGARAID
-#undef  CONFIG_SCSI_BUSLOGIC
+#define CONFIG_SCSI_AM53C974_MODULE 1
+#define CONFIG_SCSI_MEGARAID 1
+#define CONFIG_SCSI_BUSLOGIC 1
+#define CONFIG_SCSI_OMIT_FLASHPOINT 1
 #undef  CONFIG_SCSI_CPQFCTS
+#define CONFIG_SCSI_CPQFCTS_MODULE 1
 #undef  CONFIG_SCSI_DMX3191D
+#define CONFIG_SCSI_DMX3191D_MODULE 1
 #undef  CONFIG_SCSI_DTC3280
+#define CONFIG_SCSI_DTC3280_MODULE 1
 #undef  CONFIG_SCSI_EATA
+#define CONFIG_SCSI_EATA_MODULE 1
+#undef  CONFIG_SCSI_EATA_TAGGED_QUEUE
+#undef  CONFIG_SCSI_EATA_LINKED_COMMANDS
+#define CONFIG_SCSI_EATA_MAX_TAGS (16)
 #undef  CONFIG_SCSI_EATA_DMA
+#define CONFIG_SCSI_EATA_DMA_MODULE 1
 #undef  CONFIG_SCSI_EATA_PIO
+#define CONFIG_SCSI_EATA_PIO_MODULE 1
 #undef  CONFIG_SCSI_FUTURE_DOMAIN
+#define CONFIG_SCSI_FUTURE_DOMAIN_MODULE 1
 #undef  CONFIG_SCSI_GDTH
-#undef  CONFIG_SCSI_GENERIC_NCR5380
+#define CONFIG_SCSI_GDTH_MODULE 1
+#define CONFIG_SCSI_GENERIC_NCR5380 1
+#undef  CONFIG_SCSI_GENERIC_NCR53C400
+#define CONFIG_SCSI_G_NCR5380_PORT 1
+#undef  CONFIG_SCSI_G_NCR5380_MEM
 #undef  CONFIG_SCSI_IPS
+#define CONFIG_SCSI_IPS_MODULE 1
 #undef  CONFIG_SCSI_INITIO
+#define CONFIG_SCSI_INITIO_MODULE 1
 #undef  CONFIG_SCSI_INIA100
-#undef  CONFIG_SCSI_NCR53C406A
-#undef  CONFIG_SCSI_NCR53C7xx
-#undef  CONFIG_SCSI_NCR53C8XX
-#undef  CONFIG_SCSI_SYM53C8XX
+#define CONFIG_SCSI_INIA100_MODULE 1
+#define CONFIG_SCSI_NCR53C406A 1
+#define CONFIG_SCSI_NCR53C7xx 1
+#undef  CONFIG_SCSI_NCR53C7xx_sync
+#undef  CONFIG_SCSI_NCR53C7xx_FAST
+#undef  CONFIG_SCSI_NCR53C7xx_DISCONNECT
 #undef  CONFIG_SCSI_PAS16
+#define CONFIG_SCSI_PAS16_MODULE 1
 #undef  CONFIG_SCSI_PCI2000
+#define CONFIG_SCSI_PCI2000_MODULE 1
 #undef  CONFIG_SCSI_PCI2220I
+#define CONFIG_SCSI_PCI2220I_MODULE 1
 #undef  CONFIG_SCSI_PSI240I
+#define CONFIG_SCSI_PSI240I_MODULE 1
 #undef  CONFIG_SCSI_QLOGIC_FAS
+#define CONFIG_SCSI_QLOGIC_FAS_MODULE 1
 #undef  CONFIG_SCSI_QLOGIC_ISP
+#define CONFIG_SCSI_QLOGIC_ISP_MODULE 1
 #undef  CONFIG_SCSI_QLOGIC_FC
+#define CONFIG_SCSI_QLOGIC_FC_MODULE 1
 #undef  CONFIG_SCSI_QLOGIC_1280
+#define CONFIG_SCSI_QLOGIC_1280_MODULE 1
 #undef  CONFIG_SCSI_SEAGATE
-#undef  CONFIG_SCSI_SIM710
-#undef  CONFIG_SCSI_SYM53C416
+#define CONFIG_SCSI_SEAGATE_MODULE 1
+#define CONFIG_SCSI_SIM710 1
+#define CONFIG_SCSI_SYM53C416 1
 #define CONFIG_SCSI_DC390T 1
 #undef  CONFIG_SCSI_DC390T_NOGENSUPP
 #undef  CONFIG_SCSI_T128
+#define CONFIG_SCSI_T128_MODULE 1
 #undef  CONFIG_SCSI_U14_34F
+#define CONFIG_SCSI_U14_34F_MODULE 1
+#undef  CONFIG_SCSI_U14_34F_LINKED_COMMANDS
+#define CONFIG_SCSI_U14_34F_MAX_TAGS (8)
 #undef  CONFIG_SCSI_ULTRASTOR
+#define CONFIG_SCSI_ULTRASTOR_MODULE 1
 #undef  CONFIG_SCSI_DEBUG
 
 /*
+ * PCMCIA SCSI adapter support
+ */
+#define CONFIG_SCSI_PCMCIA 1
+#undef  CONFIG_PCMCIA_AHA152X
+#define CONFIG_PCMCIA_AHA152X_MODULE 1
+#undef  CONFIG_PCMCIA_QLOGIC
+#define CONFIG_PCMCIA_QLOGIC_MODULE 1
+#undef  CONFIG_PCMCIA_FDOMAIN
+#define CONFIG_PCMCIA_FDOMAIN_MODULE 1
+#undef  CONFIG_PCMCIA_APA1480
+#define CONFIG_PCMCIA_APA1480_MODULE 1
+
+/*
  * IEEE 1394 (FireWire) support
  */
 #undef  CONFIG_IEEE1394
@@ -353,51 +421,124 @@
  * Ethernet (10 or 100Mbit)
  */
 #define CONFIG_NET_ETHERNET 1
-#undef  CONFIG_NET_VENDOR_3COM
+#define CONFIG_NET_VENDOR_3COM 1
+#undef  CONFIG_EL1
+#define CONFIG_EL1_MODULE 1
+#undef  CONFIG_EL2
+#define CONFIG_EL2_MODULE 1
+#undef  CONFIG_ELPLUS
+#define CONFIG_ELPLUS_MODULE 1
+#undef  CONFIG_EL16
+#define CONFIG_EL16_MODULE 1
+#undef  CONFIG_EL3
+#define CONFIG_EL3_MODULE 1
+#undef  CONFIG_3C515
+#define CONFIG_3C515_MODULE 1
+#undef  CONFIG_ELMC
+#undef  CONFIG_ELMC_II
+#undef  CONFIG_VORTEX
+#define CONFIG_VORTEX_MODULE 1
 #undef  CONFIG_LANCE
-#undef  CONFIG_NET_VENDOR_SMC
-#undef  CONFIG_NET_VENDOR_RACAL
+#define CONFIG_LANCE_MODULE 1
+#define CONFIG_NET_VENDOR_SMC 1
+#undef  CONFIG_WD80x3
+#define CONFIG_WD80x3_MODULE 1
+#undef  CONFIG_ULTRA
+#define CONFIG_ULTRA_MODULE 1
+#undef  CONFIG_ULTRA32
+#undef  CONFIG_SMC9194
+#define CONFIG_SMC9194_MODULE 1
+#define CONFIG_NET_VENDOR_RACAL 1
+#undef  CONFIG_NI5010
+#define CONFIG_NI5010_MODULE 1
+#undef  CONFIG_NI52
+#define CONFIG_NI52_MODULE 1
+#undef  CONFIG_NI65
+#define CONFIG_NI65_MODULE 1
 #undef  CONFIG_AT1700
+#define CONFIG_AT1700_MODULE 1
 #undef  CONFIG_DEPCA
+#define CONFIG_DEPCA_MODULE 1
 #undef  CONFIG_HP100
-#undef  CONFIG_NET_ISA
+#define CONFIG_HP100_MODULE 1
+#define CONFIG_NET_ISA 1
+#undef  CONFIG_E2100
+#define CONFIG_E2100_MODULE 1
+#undef  CONFIG_EEXPRESS
+#define CONFIG_EEXPRESS_MODULE 1
+#undef  CONFIG_EEXPRESS_PRO
+#define CONFIG_EEXPRESS_PRO_MODULE 1
+#undef  CONFIG_HPLAN_PLUS
+#define CONFIG_HPLAN_PLUS_MODULE 1
+#undef  CONFIG_HPLAN
+#define CONFIG_HPLAN_MODULE 1
+#undef  CONFIG_ETH16I
+#define CONFIG_ETH16I_MODULE 1
+#undef  CONFIG_NE2000
+#define CONFIG_NE2000_MODULE 1
+#undef  CONFIG_SK_G16
+#define CONFIG_SK_G16_MODULE 1
 #define CONFIG_NET_PCI 1
 #undef  CONFIG_PCNET32
+#define CONFIG_PCNET32_MODULE 1
 #undef  CONFIG_ADAPTEC_STARFIRE
+#define CONFIG_ADAPTEC_STARFIRE_MODULE 1
 #undef  CONFIG_AC3200
+#define CONFIG_AC3200_MODULE 1
 #undef  CONFIG_APRICOT
+#define CONFIG_APRICOT_MODULE 1
 #undef  CONFIG_CS89x0
+#define CONFIG_CS89x0_MODULE 1
 #undef  CONFIG_TULIP
 #define CONFIG_TULIP_MODULE 1
 #undef  CONFIG_DE4X5
 #define CONFIG_DE4X5_MODULE 1
 #undef  CONFIG_DGRS
+#define CONFIG_DGRS_MODULE 1
 #undef  CONFIG_DM9102
+#define CONFIG_DM9102_MODULE 1
 #undef  CONFIG_EEPRO100
+#define CONFIG_EEPRO100_MODULE 1
 #undef  CONFIG_EEPRO100_PM
 #undef  CONFIG_LNE390
 #undef  CONFIG_NATSEMI
+#define CONFIG_NATSEMI_MODULE 1
 #undef  CONFIG_NE2K_PCI
+#define CONFIG_NE2K_PCI_MODULE 1
 #undef  CONFIG_NE3210
 #undef  CONFIG_ES3210
 #undef  CONFIG_8139TOO
+#define CONFIG_8139TOO_MODULE 1
 #undef  CONFIG_RTL8129
+#define CONFIG_RTL8129_MODULE 1
 #undef  CONFIG_SIS900
+#define CONFIG_SIS900_MODULE 1
 #undef  CONFIG_EPIC100
+#define CONFIG_EPIC100_MODULE 1
 #undef  CONFIG_SUNDANCE
+#define CONFIG_SUNDANCE_MODULE 1
 #undef  CONFIG_TLAN
+#define CONFIG_TLAN_MODULE 1
 #undef  CONFIG_VIA_RHINE
+#define CONFIG_VIA_RHINE_MODULE 1
 #undef  CONFIG_WINBOND_840
+#define CONFIG_WINBOND_840_MODULE 1
 #undef  CONFIG_HAPPYMEAL
+#define CONFIG_HAPPYMEAL_MODULE 1
 #undef  CONFIG_NET_POCKET
 
 /*
  * Ethernet (1000 Mbit)
  */
 #undef  CONFIG_ACENIC
+#define CONFIG_ACENIC_MODULE 1
+#undef  CONFIG_ACENIC_OMIT_TIGON_I
 #undef  CONFIG_HAMACHI
+#define CONFIG_HAMACHI_MODULE 1
 #undef  CONFIG_YELLOWFIN
+#define CONFIG_YELLOWFIN_MODULE 1
 #undef  CONFIG_SK98LIN
+#define CONFIG_SK98LIN_MODULE 1
 #undef  CONFIG_FDDI
 #undef  CONFIG_HIPPI
 #undef  CONFIG_PPP
@@ -422,6 +563,38 @@
 #undef  CONFIG_WAN
 
 /*
+ * PCMCIA network device support
+ */
+#define CONFIG_NET_PCMCIA 1
+#undef  CONFIG_PCMCIA_3C589
+#define CONFIG_PCMCIA_3C589_MODULE 1
+#undef  CONFIG_PCMCIA_3C574
+#define CONFIG_PCMCIA_3C574_MODULE 1
+#undef  CONFIG_PCMCIA_FMVJ18X
+#define CONFIG_PCMCIA_FMVJ18X_MODULE 1
+#undef  CONFIG_PCMCIA_PCNET
+#define CONFIG_PCMCIA_PCNET_MODULE 1
+#undef  CONFIG_PCMCIA_NMCLAN
+#define CONFIG_PCMCIA_NMCLAN_MODULE 1
+#undef  CONFIG_PCMCIA_SMC91C92
+#define CONFIG_PCMCIA_SMC91C92_MODULE 1
+#undef  CONFIG_PCMCIA_XIRC2PS
+#define CONFIG_PCMCIA_XIRC2PS_MODULE 1
+#undef  CONFIG_ARCNET_COM20020_CS
+#undef  CONFIG_PCMCIA_IBMTR
+#undef  CONFIG_PCMCIA_XIRTULIP
+#define CONFIG_PCMCIA_XIRTULIP_MODULE 1
+#define CONFIG_NET_PCMCIA_RADIO 1
+#undef  CONFIG_PCMCIA_RAYCS
+#define CONFIG_PCMCIA_RAYCS_MODULE 1
+#undef  CONFIG_PCMCIA_NETWAVE
+#define CONFIG_PCMCIA_NETWAVE_MODULE 1
+#undef  CONFIG_PCMCIA_WAVELAN
+#define CONFIG_PCMCIA_WAVELAN_MODULE 1
+#undef  CONFIG_AIRONET4500_CS
+#define CONFIG_AIRONET4500_CS_MODULE 1
+
+/*
  * Amateur Radio support
  */
 #undef  CONFIG_HAMRADIO
@@ -492,6 +665,13 @@
 #undef  CONFIG_FTAPE
 #undef  CONFIG_AGP
 #undef  CONFIG_DRM
+#define CONFIG_PCMCIA_SERIAL 1
+
+/*
+ * PCMCIA character device support
+ */
+#undef  CONFIG_PCMCIA_SERIAL_CS
+#undef  CONFIG_PCMCIA_SERIAL_CB
 
 /*
  * Multimedia devices
@@ -511,10 +691,11 @@
 #undef  CONFIG_AFFS_FS
 #undef  CONFIG_HFS_FS
 #undef  CONFIG_BFS_FS
-#undef  CONFIG_FAT_FS
-#undef  CONFIG_MSDOS_FS
+#define CONFIG_FAT_FS 1
+#define CONFIG_MSDOS_FS 1
 #undef  CONFIG_UMSDOS_FS
-#undef  CONFIG_VFAT_FS
+#define CONFIG_UMSDOS_FS_MODULE 1
+#define CONFIG_VFAT_FS 1
 #undef  CONFIG_EFS_FS
 #undef  CONFIG_JFFS_FS
 #undef  CONFIG_CRAMFS
@@ -546,13 +727,19 @@
  */
 #undef  CONFIG_CODA_FS
 #undef  CONFIG_NFS_FS
-#undef  CONFIG_NFS_V3
+#define CONFIG_NFS_FS_MODULE 1
+#define CONFIG_NFS_V3 1
 #undef  CONFIG_ROOT_NFS
 #undef  CONFIG_NFSD
 #undef  CONFIG_NFSD_V3
 #undef  CONFIG_SUNRPC
+#define CONFIG_SUNRPC_MODULE 1
 #undef  CONFIG_LOCKD
+#define CONFIG_LOCKD_MODULE 1
+#define CONFIG_LOCKD_V4 1
 #undef  CONFIG_SMB_FS
+#define CONFIG_SMB_FS_MODULE 1
+#undef  CONFIG_SMB_NLS_DEFAULT
 #undef  CONFIG_NCP_FS
 #undef  CONFIG_NCPFS_PACKET_SIGNING
 #undef  CONFIG_NCPFS_IOCTL_LOCKING
@@ -568,7 +755,7 @@
  */
 #undef  CONFIG_PARTITION_ADVANCED
 #define CONFIG_MSDOS_PARTITION 1
-#undef  CONFIG_SMB_NLS
+#define CONFIG_SMB_NLS 1
 #define CONFIG_NLS 1
 
 /*
@@ -576,38 +763,71 @@
  */
 #define CONFIG_NLS_DEFAULT "iso8859-1"
 #undef  CONFIG_NLS_CODEPAGE_437
+#define CONFIG_NLS_CODEPAGE_437_MODULE 1
 #undef  CONFIG_NLS_CODEPAGE_737
+#define CONFIG_NLS_CODEPAGE_737_MODULE 1
 #undef  CONFIG_NLS_CODEPAGE_775
+#define CONFIG_NLS_CODEPAGE_775_MODULE 1
 #undef  CONFIG_NLS_CODEPAGE_850
+#define CONFIG_NLS_CODEPAGE_850_MODULE 1
 #undef  CONFIG_NLS_CODEPAGE_852
+#define CONFIG_NLS_CODEPAGE_852_MODULE 1
 #undef  CONFIG_NLS_CODEPAGE_855
+#define CONFIG_NLS_CODEPAGE_855_MODULE 1
 #undef  CONFIG_NLS_CODEPAGE_857
+#define CONFIG_NLS_CODEPAGE_857_MODULE 1
 #undef  CONFIG_NLS_CODEPAGE_860
+#define CONFIG_NLS_CODEPAGE_860_MODULE 1
 #undef  CONFIG_NLS_CODEPAGE_861
+#define CONFIG_NLS_CODEPAGE_861_MODULE 1
 #undef  CONFIG_NLS_CODEPAGE_862
+#define CONFIG_NLS_CODEPAGE_862_MODULE 1
 #undef  CONFIG_NLS_CODEPAGE_863
+#define CONFIG_NLS_CODEPAGE_863_MODULE 1
 #undef  CONFIG_NLS_CODEPAGE_864
+#define CONFIG_NLS_CODEPAGE_864_MODULE 1
 #undef  CONFIG_NLS_CODEPAGE_865
+#define CONFIG_NLS_CODEPAGE_865_MODULE 1
 #undef  CONFIG_NLS_CODEPAGE_866
+#define CONFIG_NLS_CODEPAGE_866_MODULE 1
 #undef  CONFIG_NLS_CODEPAGE_869
+#define CONFIG_NLS_CODEPAGE_869_MODULE 1
 #undef  CONFIG_NLS_CODEPAGE_874
+#define CONFIG_NLS_CODEPAGE_874_MODULE 1
 #undef  CONFIG_NLS_CODEPAGE_932
+#define CONFIG_NLS_CODEPAGE_932_MODULE 1
 #undef  CONFIG_NLS_CODEPAGE_936
+#define CONFIG_NLS_CODEPAGE_936_MODULE 1
 #undef  CONFIG_NLS_CODEPAGE_949
+#define CONFIG_NLS_CODEPAGE_949_MODULE 1
 #undef  CONFIG_NLS_CODEPAGE_950
-#define CONFIG_NLS_ISO8859_1 1
+#define CONFIG_NLS_CODEPAGE_950_MODULE 1
+#undef  CONFIG_NLS_ISO8859_1
+#define CONFIG_NLS_ISO8859_1_MODULE 1
 #undef  CONFIG_NLS_ISO8859_2
+#define CONFIG_NLS_ISO8859_2_MODULE 1
 #undef  CONFIG_NLS_ISO8859_3
+#define CONFIG_NLS_ISO8859_3_MODULE 1
 #undef  CONFIG_NLS_ISO8859_4
+#define CONFIG_NLS_ISO8859_4_MODULE 1
 #undef  CONFIG_NLS_ISO8859_5
+#define CONFIG_NLS_ISO8859_5_MODULE 1
 #undef  CONFIG_NLS_ISO8859_6
+#define CONFIG_NLS_ISO8859_6_MODULE 1
 #undef  CONFIG_NLS_ISO8859_7
+#define CONFIG_NLS_ISO8859_7_MODULE 1
 #undef  CONFIG_NLS_ISO8859_8
+#define CONFIG_NLS_ISO8859_8_MODULE 1
 #undef  CONFIG_NLS_ISO8859_9
+#define CONFIG_NLS_ISO8859_9_MODULE 1
 #undef  CONFIG_NLS_ISO8859_14
+#define CONFIG_NLS_ISO8859_14_MODULE 1
 #undef  CONFIG_NLS_ISO8859_15
+#define CONFIG_NLS_ISO8859_15_MODULE 1
 #undef  CONFIG_NLS_KOI8_R
+#define CONFIG_NLS_KOI8_R_MODULE 1
 #undef  CONFIG_NLS_UTF8
+#define CONFIG_NLS_UTF8_MODULE 1
 
 /*
  * Console drivers
diff --git a/sys-kernel/linux-bootdisk/files/2.4.1_pre8/config b/sys-kernel/linux-bootdisk/files/2.4.1_pre8/config
index d3a5c3680e62..b11c58be1c04 100644
--- a/sys-kernel/linux-bootdisk/files/2.4.1_pre8/config
+++ b/sys-kernel/linux-bootdisk/files/2.4.1_pre8/config
@@ -71,8 +71,15 @@ CONFIG_PCI_DIRECT=y
 CONFIG_PCI_NAMES=y
 # CONFIG_EISA is not set
 # CONFIG_MCA is not set
-# CONFIG_HOTPLUG is not set
-# CONFIG_PCMCIA is not set
+CONFIG_HOTPLUG=y
+
+#
+# PCMCIA/CardBus support
+#
+CONFIG_PCMCIA=y
+CONFIG_CARDBUS=y
+CONFIG_I82365=y
+# CONFIG_TCIC is not set
 CONFIG_SYSVIPC=y
 # CONFIG_BSD_PROCESS_ACCT is not set
 CONFIG_SYSCTL=y
@@ -105,8 +112,8 @@ CONFIG_APM_REAL_MODE_POWER_OFF=y
 #
 # Plug and Play configuration
 #
-# CONFIG_PNP is not set
-# CONFIG_ISAPNP is not set
+CONFIG_PNP=y
+CONFIG_ISAPNP=y
 
 #
 # Block devices
@@ -114,9 +121,9 @@ CONFIG_APM_REAL_MODE_POWER_OFF=y
 CONFIG_BLK_DEV_FD=y
 # CONFIG_BLK_DEV_XD is not set
 # CONFIG_PARIDE is not set
-# CONFIG_BLK_CPQ_DA is not set
-# CONFIG_BLK_CPQ_CISS_DA is not set
-# CONFIG_BLK_DEV_DAC960 is not set
+CONFIG_BLK_CPQ_DA=m
+CONFIG_BLK_CPQ_CISS_DA=m
+CONFIG_BLK_DEV_DAC960=m
 CONFIG_BLK_DEV_LOOP=y
 # CONFIG_BLK_DEV_NBD is not set
 CONFIG_BLK_DEV_RAM=y
@@ -126,14 +133,14 @@ CONFIG_BLK_DEV_INITRD=y
 #
 # Multi-device support (RAID and LVM)
 #
-# CONFIG_MD is not set
-# CONFIG_BLK_DEV_MD is not set
-# CONFIG_MD_LINEAR is not set
-# CONFIG_MD_RAID0 is not set
-# CONFIG_MD_RAID1 is not set
-# CONFIG_MD_RAID5 is not set
-# CONFIG_BLK_DEV_LVM is not set
-# CONFIG_LVM_PROC_FS is not set
+CONFIG_MD=y
+CONFIG_BLK_DEV_MD=m
+CONFIG_MD_LINEAR=m
+CONFIG_MD_RAID0=m
+CONFIG_MD_RAID1=m
+CONFIG_MD_RAID5=m
+CONFIG_BLK_DEV_LVM=m
+CONFIG_LVM_PROC_FS=y
 
 #
 # Networking options
@@ -267,9 +274,9 @@ CONFIG_SR_EXTRA_DEVS=4
 #
 # SCSI low-level drivers
 #
-# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
-# CONFIG_SCSI_7000FASST is not set
-# CONFIG_SCSI_ACARD is not set
+CONFIG_BLK_DEV_3W_XXXX_RAID=m
+CONFIG_SCSI_7000FASST=m
+CONFIG_SCSI_ACARD=m
 CONFIG_SCSI_AHA152X=y
 CONFIG_SCSI_AHA1542=y
 CONFIG_SCSI_AHA1740=y
@@ -278,46 +285,65 @@ CONFIG_SCSI_AIC7XXX=y
 CONFIG_AIC7XXX_CMDS_PER_DEVICE=8
 # CONFIG_AIC7XXX_PROC_STATS is not set
 CONFIG_AIC7XXX_RESET_DELAY=5
-# CONFIG_SCSI_ADVANSYS is not set
-# CONFIG_SCSI_IN2000 is not set
-# CONFIG_SCSI_AM53C974 is not set
-# CONFIG_SCSI_MEGARAID is not set
-# CONFIG_SCSI_BUSLOGIC is not set
-# CONFIG_SCSI_CPQFCTS is not set
-# CONFIG_SCSI_DMX3191D is not set
-# CONFIG_SCSI_DTC3280 is not set
-# CONFIG_SCSI_EATA is not set
-# CONFIG_SCSI_EATA_DMA is not set
-# CONFIG_SCSI_EATA_PIO is not set
-# CONFIG_SCSI_FUTURE_DOMAIN is not set
-# CONFIG_SCSI_GDTH is not set
-# CONFIG_SCSI_GENERIC_NCR5380 is not set
-# CONFIG_SCSI_IPS is not set
-# CONFIG_SCSI_INITIO is not set
-# CONFIG_SCSI_INIA100 is not set
-# CONFIG_SCSI_NCR53C406A is not set
-# CONFIG_SCSI_NCR53C7xx is not set
-# CONFIG_SCSI_NCR53C8XX is not set
-# CONFIG_SCSI_SYM53C8XX is not set
-# CONFIG_SCSI_PAS16 is not set
-# CONFIG_SCSI_PCI2000 is not set
-# CONFIG_SCSI_PCI2220I is not set
-# CONFIG_SCSI_PSI240I is not set
-# CONFIG_SCSI_QLOGIC_FAS is not set
-# CONFIG_SCSI_QLOGIC_ISP is not set
-# CONFIG_SCSI_QLOGIC_FC is not set
-# CONFIG_SCSI_QLOGIC_1280 is not set
-# CONFIG_SCSI_SEAGATE is not set
-# CONFIG_SCSI_SIM710 is not set
-# CONFIG_SCSI_SYM53C416 is not set
+CONFIG_SCSI_ADVANSYS=m
+CONFIG_SCSI_IN2000=m
+CONFIG_SCSI_AM53C974=m
+CONFIG_SCSI_MEGARAID=y
+CONFIG_SCSI_BUSLOGIC=y
+CONFIG_SCSI_OMIT_FLASHPOINT=y
+CONFIG_SCSI_CPQFCTS=m
+CONFIG_SCSI_DMX3191D=m
+CONFIG_SCSI_DTC3280=m
+CONFIG_SCSI_EATA=m
+# CONFIG_SCSI_EATA_TAGGED_QUEUE is not set
+# CONFIG_SCSI_EATA_LINKED_COMMANDS is not set
+CONFIG_SCSI_EATA_MAX_TAGS=16
+CONFIG_SCSI_EATA_DMA=m
+CONFIG_SCSI_EATA_PIO=m
+CONFIG_SCSI_FUTURE_DOMAIN=m
+CONFIG_SCSI_GDTH=m
+CONFIG_SCSI_GENERIC_NCR5380=y
+# CONFIG_SCSI_GENERIC_NCR53C400 is not set
+CONFIG_SCSI_G_NCR5380_PORT=y
+# CONFIG_SCSI_G_NCR5380_MEM is not set
+CONFIG_SCSI_IPS=m
+CONFIG_SCSI_INITIO=m
+CONFIG_SCSI_INIA100=m
+CONFIG_SCSI_NCR53C406A=y
+CONFIG_SCSI_NCR53C7xx=y
+# CONFIG_SCSI_NCR53C7xx_sync is not set
+# CONFIG_SCSI_NCR53C7xx_FAST is not set
+# CONFIG_SCSI_NCR53C7xx_DISCONNECT is not set
+CONFIG_SCSI_PAS16=m
+CONFIG_SCSI_PCI2000=m
+CONFIG_SCSI_PCI2220I=m
+CONFIG_SCSI_PSI240I=m
+CONFIG_SCSI_QLOGIC_FAS=m
+CONFIG_SCSI_QLOGIC_ISP=m
+CONFIG_SCSI_QLOGIC_FC=m
+CONFIG_SCSI_QLOGIC_1280=m
+CONFIG_SCSI_SEAGATE=m
+CONFIG_SCSI_SIM710=y
+CONFIG_SCSI_SYM53C416=y
 CONFIG_SCSI_DC390T=y
 # CONFIG_SCSI_DC390T_NOGENSUPP is not set
-# CONFIG_SCSI_T128 is not set
-# CONFIG_SCSI_U14_34F is not set
-# CONFIG_SCSI_ULTRASTOR is not set
+CONFIG_SCSI_T128=m
+CONFIG_SCSI_U14_34F=m
+# CONFIG_SCSI_U14_34F_LINKED_COMMANDS is not set
+CONFIG_SCSI_U14_34F_MAX_TAGS=8
+CONFIG_SCSI_ULTRASTOR=m
 # CONFIG_SCSI_DEBUG is not set
 
 #
+# PCMCIA SCSI adapter support
+#
+CONFIG_SCSI_PCMCIA=y
+CONFIG_PCMCIA_AHA152X=m
+CONFIG_PCMCIA_QLOGIC=m
+CONFIG_PCMCIA_FDOMAIN=m
+CONFIG_PCMCIA_APA1480=m
+
+#
 # IEEE 1394 (FireWire) support
 #
 # CONFIG_IEEE1394 is not set
@@ -351,49 +377,74 @@ CONFIG_DUMMY=m
 # Ethernet (10 or 100Mbit)
 #
 CONFIG_NET_ETHERNET=y
-# CONFIG_NET_VENDOR_3COM is not set
-# CONFIG_LANCE is not set
-# CONFIG_NET_VENDOR_SMC is not set
-# CONFIG_NET_VENDOR_RACAL is not set
-# CONFIG_AT1700 is not set
-# CONFIG_DEPCA is not set
-# CONFIG_HP100 is not set
-# CONFIG_NET_ISA is not set
+CONFIG_NET_VENDOR_3COM=y
+CONFIG_EL1=m
+CONFIG_EL2=m
+CONFIG_ELPLUS=m
+CONFIG_EL16=m
+CONFIG_EL3=m
+CONFIG_3C515=m
+# CONFIG_ELMC is not set
+# CONFIG_ELMC_II is not set
+CONFIG_VORTEX=m
+CONFIG_LANCE=m
+CONFIG_NET_VENDOR_SMC=y
+CONFIG_WD80x3=m
+CONFIG_ULTRA=m
+# CONFIG_ULTRA32 is not set
+CONFIG_SMC9194=m
+CONFIG_NET_VENDOR_RACAL=y
+CONFIG_NI5010=m
+CONFIG_NI52=m
+CONFIG_NI65=m
+CONFIG_AT1700=m
+CONFIG_DEPCA=m
+CONFIG_HP100=m
+CONFIG_NET_ISA=y
+CONFIG_E2100=m
+CONFIG_EEXPRESS=m
+CONFIG_EEXPRESS_PRO=m
+CONFIG_HPLAN_PLUS=m
+CONFIG_HPLAN=m
+CONFIG_ETH16I=m
+CONFIG_NE2000=m
+CONFIG_SK_G16=m
 CONFIG_NET_PCI=y
-# CONFIG_PCNET32 is not set
-# CONFIG_ADAPTEC_STARFIRE is not set
-# CONFIG_AC3200 is not set
-# CONFIG_APRICOT is not set
-# CONFIG_CS89x0 is not set
+CONFIG_PCNET32=m
+CONFIG_ADAPTEC_STARFIRE=m
+CONFIG_AC3200=m
+CONFIG_APRICOT=m
+CONFIG_CS89x0=m
 CONFIG_TULIP=m
 CONFIG_DE4X5=m
-# CONFIG_DGRS is not set
-# CONFIG_DM9102 is not set
-# CONFIG_EEPRO100 is not set
+CONFIG_DGRS=m
+CONFIG_DM9102=m
+CONFIG_EEPRO100=m
 # CONFIG_EEPRO100_PM is not set
 # CONFIG_LNE390 is not set
-# CONFIG_NATSEMI is not set
-# CONFIG_NE2K_PCI is not set
+CONFIG_NATSEMI=m
+CONFIG_NE2K_PCI=m
 # CONFIG_NE3210 is not set
 # CONFIG_ES3210 is not set
-# CONFIG_8139TOO is not set
-# CONFIG_RTL8129 is not set
-# CONFIG_SIS900 is not set
-# CONFIG_EPIC100 is not set
-# CONFIG_SUNDANCE is not set
-# CONFIG_TLAN is not set
-# CONFIG_VIA_RHINE is not set
-# CONFIG_WINBOND_840 is not set
-# CONFIG_HAPPYMEAL is not set
+CONFIG_8139TOO=m
+CONFIG_RTL8129=m
+CONFIG_SIS900=m
+CONFIG_EPIC100=m
+CONFIG_SUNDANCE=m
+CONFIG_TLAN=m
+CONFIG_VIA_RHINE=m
+CONFIG_WINBOND_840=m
+CONFIG_HAPPYMEAL=m
 # CONFIG_NET_POCKET is not set
 
 #
 # Ethernet (1000 Mbit)
 #
-# CONFIG_ACENIC is not set
-# CONFIG_HAMACHI is not set
-# CONFIG_YELLOWFIN is not set
-# CONFIG_SK98LIN is not set
+CONFIG_ACENIC=m
+# CONFIG_ACENIC_OMIT_TIGON_I is not set
+CONFIG_HAMACHI=m
+CONFIG_YELLOWFIN=m
+CONFIG_SK98LIN=m
 # CONFIG_FDDI is not set
 # CONFIG_HIPPI is not set
 # CONFIG_PPP is not set
@@ -418,6 +469,26 @@ CONFIG_DE4X5=m
 # CONFIG_WAN is not set
 
 #
+# PCMCIA network device support
+#
+CONFIG_NET_PCMCIA=y
+CONFIG_PCMCIA_3C589=m
+CONFIG_PCMCIA_3C574=m
+CONFIG_PCMCIA_FMVJ18X=m
+CONFIG_PCMCIA_PCNET=m
+CONFIG_PCMCIA_NMCLAN=m
+CONFIG_PCMCIA_SMC91C92=m
+CONFIG_PCMCIA_XIRC2PS=m
+# CONFIG_ARCNET_COM20020_CS is not set
+# CONFIG_PCMCIA_IBMTR is not set
+CONFIG_PCMCIA_XIRTULIP=m
+CONFIG_NET_PCMCIA_RADIO=y
+CONFIG_PCMCIA_RAYCS=m
+CONFIG_PCMCIA_NETWAVE=m
+CONFIG_PCMCIA_WAVELAN=m
+CONFIG_AIRONET4500_CS=m
+
+#
 # Amateur Radio support
 #
 # CONFIG_HAMRADIO is not set
@@ -488,6 +559,13 @@ CONFIG_UNIX98_PTY_COUNT=256
 # CONFIG_FTAPE is not set
 # CONFIG_AGP is not set
 # CONFIG_DRM is not set
+CONFIG_PCMCIA_SERIAL=y
+
+#
+# PCMCIA character device support
+#
+# CONFIG_PCMCIA_SERIAL_CS is not set
+# CONFIG_PCMCIA_SERIAL_CB is not set
 
 #
 # Multimedia devices
@@ -507,10 +585,10 @@ CONFIG_REISERFS_FS=y
 # CONFIG_AFFS_FS is not set
 # CONFIG_HFS_FS is not set
 # CONFIG_BFS_FS is not set
-# CONFIG_FAT_FS is not set
-# CONFIG_MSDOS_FS is not set
-# CONFIG_UMSDOS_FS is not set
-# CONFIG_VFAT_FS is not set
+CONFIG_FAT_FS=y
+CONFIG_MSDOS_FS=y
+CONFIG_UMSDOS_FS=m
+CONFIG_VFAT_FS=y
 # CONFIG_EFS_FS is not set
 # CONFIG_JFFS_FS is not set
 # CONFIG_CRAMFS is not set
@@ -541,14 +619,16 @@ CONFIG_EXT2_FS=y
 # Network File Systems
 #
 # CONFIG_CODA_FS is not set
-# CONFIG_NFS_FS is not set
-# CONFIG_NFS_V3 is not set
+CONFIG_NFS_FS=m
+CONFIG_NFS_V3=y
 # CONFIG_ROOT_NFS is not set
 # CONFIG_NFSD is not set
 # CONFIG_NFSD_V3 is not set
-# CONFIG_SUNRPC is not set
-# CONFIG_LOCKD is not set
-# CONFIG_SMB_FS is not set
+CONFIG_SUNRPC=m
+CONFIG_LOCKD=m
+CONFIG_LOCKD_V4=y
+CONFIG_SMB_FS=m
+# CONFIG_SMB_NLS_DEFAULT is not set
 # CONFIG_NCP_FS is not set
 # CONFIG_NCPFS_PACKET_SIGNING is not set
 # CONFIG_NCPFS_IOCTL_LOCKING is not set
@@ -564,46 +644,46 @@ CONFIG_EXT2_FS=y
 #
 # CONFIG_PARTITION_ADVANCED is not set
 CONFIG_MSDOS_PARTITION=y
-# CONFIG_SMB_NLS is not set
+CONFIG_SMB_NLS=y
 CONFIG_NLS=y
 
 #
 # Native Language Support
 #
 CONFIG_NLS_DEFAULT="iso8859-1"
-# CONFIG_NLS_CODEPAGE_437 is not set
-# CONFIG_NLS_CODEPAGE_737 is not set
-# CONFIG_NLS_CODEPAGE_775 is not set
-# CONFIG_NLS_CODEPAGE_850 is not set
-# CONFIG_NLS_CODEPAGE_852 is not set
-# CONFIG_NLS_CODEPAGE_855 is not set
-# CONFIG_NLS_CODEPAGE_857 is not set
-# CONFIG_NLS_CODEPAGE_860 is not set
-# CONFIG_NLS_CODEPAGE_861 is not set
-# CONFIG_NLS_CODEPAGE_862 is not set
-# CONFIG_NLS_CODEPAGE_863 is not set
-# CONFIG_NLS_CODEPAGE_864 is not set
-# CONFIG_NLS_CODEPAGE_865 is not set
-# CONFIG_NLS_CODEPAGE_866 is not set
-# CONFIG_NLS_CODEPAGE_869 is not set
-# CONFIG_NLS_CODEPAGE_874 is not set
-# CONFIG_NLS_CODEPAGE_932 is not set
-# CONFIG_NLS_CODEPAGE_936 is not set
-# CONFIG_NLS_CODEPAGE_949 is not set
-# CONFIG_NLS_CODEPAGE_950 is not set
-CONFIG_NLS_ISO8859_1=y
-# CONFIG_NLS_ISO8859_2 is not set
-# CONFIG_NLS_ISO8859_3 is not set
-# CONFIG_NLS_ISO8859_4 is not set
-# CONFIG_NLS_ISO8859_5 is not set
-# CONFIG_NLS_ISO8859_6 is not set
-# CONFIG_NLS_ISO8859_7 is not set
-# CONFIG_NLS_ISO8859_8 is not set
-# CONFIG_NLS_ISO8859_9 is not set
-# CONFIG_NLS_ISO8859_14 is not set
-# CONFIG_NLS_ISO8859_15 is not set
-# CONFIG_NLS_KOI8_R is not set
-# CONFIG_NLS_UTF8 is not set
+CONFIG_NLS_CODEPAGE_437=m
+CONFIG_NLS_CODEPAGE_737=m
+CONFIG_NLS_CODEPAGE_775=m
+CONFIG_NLS_CODEPAGE_850=m
+CONFIG_NLS_CODEPAGE_852=m
+CONFIG_NLS_CODEPAGE_855=m
+CONFIG_NLS_CODEPAGE_857=m
+CONFIG_NLS_CODEPAGE_860=m
+CONFIG_NLS_CODEPAGE_861=m
+CONFIG_NLS_CODEPAGE_862=m
+CONFIG_NLS_CODEPAGE_863=m
+CONFIG_NLS_CODEPAGE_864=m
+CONFIG_NLS_CODEPAGE_865=m
+CONFIG_NLS_CODEPAGE_866=m
+CONFIG_NLS_CODEPAGE_869=m
+CONFIG_NLS_CODEPAGE_874=m
+CONFIG_NLS_CODEPAGE_932=m
+CONFIG_NLS_CODEPAGE_936=m
+CONFIG_NLS_CODEPAGE_949=m
+CONFIG_NLS_CODEPAGE_950=m
+CONFIG_NLS_ISO8859_1=m
+CONFIG_NLS_ISO8859_2=m
+CONFIG_NLS_ISO8859_3=m
+CONFIG_NLS_ISO8859_4=m
+CONFIG_NLS_ISO8859_5=m
+CONFIG_NLS_ISO8859_6=m
+CONFIG_NLS_ISO8859_7=m
+CONFIG_NLS_ISO8859_8=m
+CONFIG_NLS_ISO8859_9=m
+CONFIG_NLS_ISO8859_14=m
+CONFIG_NLS_ISO8859_15=m
+CONFIG_NLS_KOI8_R=m
+CONFIG_NLS_UTF8=m
 
 #
 # Console drivers
diff --git a/sys-kernel/linux-bootdisk/files/digest-linux-bootdisk-2.4.1_pre8-r1 b/sys-kernel/linux-bootdisk/files/digest-linux-bootdisk-2.4.1_pre8-r1
index 6d59fc2799aa..5bb823bfdd3c 100644
--- a/sys-kernel/linux-bootdisk/files/digest-linux-bootdisk-2.4.1_pre8-r1
+++ b/sys-kernel/linux-bootdisk/files/digest-linux-bootdisk-2.4.1_pre8-r1
@@ -1,2 +1,3 @@
 MD5 18278baa4c54387b1c29f0edba55ab14 linux-2.4.0.tar.bz2
 MD5 f5a10f576a7a4827df3d2306c31eae81 patch-2.4.1-pre8.bz2
+MD5 8c5aeab0dd913c7b05e3199c203fb48e lvm_0.9.1_beta2.tar.gz
diff --git a/sys-kernel/linux-bootdisk/linux-bootdisk-2.4.1_pre8-r1.ebuild b/sys-kernel/linux-bootdisk/linux-bootdisk-2.4.1_pre8-r1.ebuild
index d2c97458089d..e6268eb427e3 100644
--- a/sys-kernel/linux-bootdisk/linux-bootdisk-2.4.1_pre8-r1.ebuild
+++ b/sys-kernel/linux-bootdisk/linux-bootdisk-2.4.1_pre8-r1.ebuild
@@ -1,21 +1,18 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Daniel Robbins <drobbins@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-bootdisk/linux-bootdisk-2.4.1_pre8-r1.ebuild,v 1.1 2001/01/21 22:07:10 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-bootdisk/linux-bootdisk-2.4.1_pre8-r1.ebuild,v 1.2 2001/01/22 05:16:24 achim Exp $
 
 S=${WORKDIR}/linux
 KV=2.4.1-pre8
-if [ "$PN" = "linux" ]
-then
-	DESCRIPTION="Linux kernel, including modules, binary tools, libraries and includes"
-else
-	DESCRIPTION="Kernel source package, including full sources, binary tools and libraries"
-fi
+DESCRIPTION="Boot-CD Kernel with LVM utilities"
 SRC_URI="
 http://www.kernel.org/pub/linux/kernel/v2.4/linux-2.4.0.tar.bz2
-http://www.kernel.org/pub/linux/kernel/testing/patch-${KV}.bz2"
+http://www.kernel.org/pub/linux/kernel/testing/patch-${KV}.bz2
+ftp://ftp.sistina.com/pub/LVM/0.9.1_beta/lvm_0.9.1_beta2.tar.gz"
 
-HOMEPAGE="http://www.kernel.org/"
+HOMEPAGE="http://www.kernel.org/
+	  http://www.sistina.com/lvm/"
 
 src_unpack() {
     cd ${WORKDIR}
@@ -23,6 +20,11 @@ src_unpack() {
     cd ${S}
     echo "Applying ${KV} patch..."
     bzip2 -dc ${DISTDIR}/patch-${KV}.bz2 | patch -p1
+
+    mkdir extras
+    cd extras
+    echo "Unpacking LVM..."
+    unpack lvm_0.9.1_beta2.tar.gz   
     echo "Preparing for compilation..."
     cd ${S}
     #this is the configuration for the default kernel
@@ -37,6 +39,10 @@ src_unpack() {
 
 src_compile() {
 
+	cd ${S}/extras/LVM/0.9.1_beta2
+	try ./configure --prefix=/ --mandir=/usr/man
+	try make
+
 	cd ${S}
 	try make symlinks
 	try make dep
@@ -47,6 +53,9 @@ src_compile() {
 
 src_install() {
 
+
+	cd ${S}/extras/LVM/0.9.1_beta2
+	try make install prefix=${D} MAN8DIR=${D}/usr/man/man8 LIBDIR=${D}/lib
 	dodir /usr/src
 
 	#grab compiled kernel
diff --git a/sys-kernel/linux/linux-2.4.1_pre8-r1.ebuild b/sys-kernel/linux/linux-2.4.1_pre8-r1.ebuild
index 3d62964989ea..6a0ff295dc37 100644
--- a/sys-kernel/linux/linux-2.4.1_pre8-r1.ebuild
+++ b/sys-kernel/linux/linux-2.4.1_pre8-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Daniel Robbins <drobbins@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux/linux-2.4.1_pre8-r1.ebuild,v 1.1 2001/01/21 04:34:52 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux/linux-2.4.1_pre8-r1.ebuild,v 1.2 2001/01/22 05:16:24 achim Exp $
 
 S=${WORKDIR}/linux
 KV=2.4.1-pre8
@@ -94,8 +94,7 @@ src_compile() {
 
 src_install() {
 
-	cd ${S}/extras/LVM/0.9.1_beta2
-	try make install prefix=${D} MAN8DIR=${D}/usr/man/man8 LIBDIR=${D}/lib
+
 	#clean up object files and original executables to reduce size of linux-sources
 	try make clean
 	dodir /usr/lib