diff options
author | Pascal Rigaux <pixel@mandriva.com> | 2007-04-25 12:26:16 +0000 |
---|---|---|
committer | Pascal Rigaux <pixel@mandriva.com> | 2007-04-25 12:26:16 +0000 |
commit | 126777bc019a54afb4ec51299f2cf9d2841698aa (patch) | |
tree | 97f76e571902ead55ba138f1156a4b4f00b9b779 /mdk-stage1/network.h | |
parent | f1f67448efc714873378dfeb8279fae68054a90a (diff) | |
download | drakx-126777bc019a54afb4ec51299f2cf9d2841698aa.tar drakx-126777bc019a54afb4ec51299f2cf9d2841698aa.tar.gz drakx-126777bc019a54afb4ec51299f2cf9d2841698aa.tar.bz2 drakx-126777bc019a54afb4ec51299f2cf9d2841698aa.tar.xz drakx-126777bc019a54afb4ec51299f2cf9d2841698aa.zip |
re-sync after the big svn loss
Diffstat (limited to 'mdk-stage1/network.h')
-rw-r--r-- | mdk-stage1/network.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/mdk-stage1/network.h b/mdk-stage1/network.h index e4612e259..3d2d94871 100644 --- a/mdk-stage1/network.h +++ b/mdk-stage1/network.h @@ -29,16 +29,15 @@ enum return_type intf_select_and_up(); enum return_type nfs_prepare(void); -#ifndef MANDRAKE_MOVE enum return_type ftp_prepare(void); enum return_type http_prepare(void); #ifndef DISABLE_KA enum return_type ka_prepare(void); #endif -#endif enum boot_proto_type { BOOTPROTO_STATIC, BOOTPROTO_DHCP, BOOTPROTO_ADSL_PPPOE }; +enum auto_detection_type { AUTO_DETECTION_NONE, AUTO_DETECTION_ALL, AUTO_DETECTION_WIRED }; /* all of these in_addr things are in network byte order! */ struct interface_info { |