moved get_device_hid call, weirdly it compiled ok with gcc4
removed config driver, added acpi as a boot module removed a duplicate etherpci git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@19323 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
@@ -95,7 +95,7 @@ BEOS_ADD_ONS_DRIVERS_GRAPHICS = $(X86_ONLY)radeon.driver $(X86_ONLY)nv.driver
|
||||
;
|
||||
BEOS_ADD_ONS_DRIVERS_MIDI = emuxki ;
|
||||
BEOS_ADD_ONS_DRIVERS_NET = etherpci ipro1000 rtl8139 rtl8169 sis900
|
||||
etherpci via-rhine wb840 net_stack
|
||||
via-rhine wb840 net_stack
|
||||
$(GPL_ONLY)bcm440x $(GPL_ONLY)bcm570x
|
||||
;
|
||||
BEOS_ADD_ONS_DRIVERS_ACPI = $(X86_ONLY)acpi_button $(X86_ONLY)acpi_ns_dump ;
|
||||
@@ -133,7 +133,7 @@ AddDriversToHaikuImage bus : usb_raw ;
|
||||
AddDriversToHaikuImage disk scsi : scsi_cd scsi_dsk ;
|
||||
AddDriversToHaikuImage graphics : $(BEOS_ADD_ONS_DRIVERS_GRAPHICS) ;
|
||||
AddDriversToHaikuImage input : ps2_hid usb_hid ;
|
||||
AddDriversToHaikuImage misc : <driver>config <driver>poke ;
|
||||
AddDriversToHaikuImage misc : <driver>poke ;
|
||||
AddDriversToHaikuImage net : $(BEOS_ADD_ONS_DRIVERS_NET) ;
|
||||
AddDriversToHaikuImage power : $(BEOS_ADD_ONS_DRIVERS_ACPI) ;
|
||||
|
||||
@@ -239,7 +239,7 @@ AddFilesToHaikuImage home config settings : <keymap>US-International : Key_map ;
|
||||
AddFilesToHaikuImage beos system : zbeos ;
|
||||
|
||||
# boot module links
|
||||
AddBootModuleSymlinks config_manager bfs block_io fast_log generic_ide_pci
|
||||
AddBootModuleSymlinks $(X86_ONLY)acpi config_manager bfs block_io fast_log generic_ide_pci
|
||||
$(X86_ONLY)isa ide ide_adapter $(X86_ONLY)ide_isa intel locked_pool
|
||||
$(PPC_ONLY)openpic pci scsi scsi_cd scsi_dsk scsi_periph
|
||||
silicon_image_3112
|
||||
|
||||
Reference in New Issue
Block a user