diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2010-02-03 16:06:41 -0800 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2010-02-03 16:06:41 -0800 |
| commit | addaeaeb3949d576c4e0eb5cfc133b7c3bcfa8fa (patch) | |
| tree | 2ffea726dc494e87ecc9f506bc6a2bc9242730e3 /gpxe/gpxe.diff | |
| parent | 5c0f48e49f8d7d084810ecf0b98a76aaebb44835 (diff) | |
| parent | e7a5f95432132c8fc8f8ede39fda1d368002ddd8 (diff) | |
| download | syslinux.git-addaeaeb3949d576c4e0eb5cfc133b7c3bcfa8fa.tar.gz syslinux.git-addaeaeb3949d576c4e0eb5cfc133b7c3bcfa8fa.tar.xz syslinux.git-addaeaeb3949d576c4e0eb5cfc133b7c3bcfa8fa.zip | |
Merge branch 'master' into i915res
Diffstat (limited to 'gpxe/gpxe.diff')
| -rw-r--r-- | gpxe/gpxe.diff | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/gpxe/gpxe.diff b/gpxe/gpxe.diff new file mode 100644 index 00000000..3df08a21 --- /dev/null +++ b/gpxe/gpxe.diff @@ -0,0 +1,15 @@ +diff --git a/gpxe/src/config/general.h b/gpxe/src/config/general.h +index 0a9e625..de51f9f 100644 +--- a/gpxe/src/config/general.h ++++ b/gpxe/src/config/general.h +@@ -55,8 +55,8 @@ FILE_LICENCE ( GPL2_OR_LATER ); + + #define DOWNLOAD_PROTO_TFTP /* Trivial File Transfer Protocol */ + #define DOWNLOAD_PROTO_HTTP /* Hypertext Transfer Protocol */ +-#undef DOWNLOAD_PROTO_HTTPS /* Secure Hypertext Transfer Protocol */ +-#undef DOWNLOAD_PROTO_FTP /* File Transfer Protocol */ ++#define DOWNLOAD_PROTO_HTTPS /* Secure Hypertext Transfer Protocol */ ++#define DOWNLOAD_PROTO_FTP /* File Transfer Protocol */ + #undef DOWNLOAD_PROTO_TFTM /* Multicast Trivial File Transfer Protocol */ + #undef DOWNLOAD_PROTO_SLAM /* Scalable Local Area Multicast */ + |