104 Bring back lx brand

@@ -39,10 +39,11 @@
 #       any "implementation architectures" could be used. We choose i86pc
 #       because it is the reference port.
 #
 UNIX_DIR         = $(UTSBASE)/i86pc/unix
 GENLIB_DIR       = $(UTSBASE)/intel/genunix
+GENASSYM_DIR     = $(UTSBASE)/intel/genassym
 IPDRV_DIR        = $(UTSBASE)/intel/ip
 MODSTUBS_DIR     = $(UNIX_DIR)
 DSF_DIR          = $(UTSBASE)/$(PLATFORM)/genassym
 LINTS_DIR        = $(OBJS_DIR)
 LINT_LIB_DIR     = $(UTSBASE)/intel/lint-libs/$(OBJS_DIR)

@@ -131,10 +132,11 @@
 ASFLAGS_XARCH_32        = $(i386_ASFLAGS)
 ASFLAGS_XARCH_64        = $(amd64_ASFLAGS)
 ASFLAGS_XARCH           = $(ASFLAGS_XARCH_$(CLASS))
 
 ASFLAGS                 += $(ASFLAGS_XARCH)
+AS_INC_PATH             += -I$(GENASSYM_DIR)/$(OBJS_DIR)
 
 #
 #       Define the base directory for installation.
 #
 BASE_INS_DIR    = $(ROOT)

@@ -500,11 +502,13 @@
 MISC_KMODS      += md_sp
 
 #
 #       Brand modules
 #
-BRAND_KMODS     += sn1_brand s10_brand
+BRAND_KMODS     += sn1_brand s10_brand lx_brand
+DRV_KMODS       += lx_systrace lx_ptm lx_audio
+STRMOD_KMODS    += ldlinux
 
 #
 #       Exec Class Modules (/kernel/exec):
 #
 EXEC_KMODS      += elfexec intpexec shbinexec javaexec

@@ -516,11 +520,11 @@
 
 #
 #       File System Modules (/kernel/fs):
 #
 FS_KMODS        += autofs cachefs ctfs dcfs dev devfs fdfs fifofs hsfs lofs
-FS_KMODS        += mntfs namefs nfs objfs zfs zut
+FS_KMODS        += lx_afs lx_proc mntfs namefs nfs objfs zfs zut
 FS_KMODS        += pcfs procfs sockfs specfs tmpfs udfs ufs sharefs
 FS_KMODS        += smbfs
 
 #
 #       Streams Modules (/kernel/strmod):