diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE index 7c5c45672d78ea45fc49d1073a696eb528d52440..5ea0406cd8ea4dbf7ff42efc737b46cc937c71d8 100644 --- a/gcc/go/gofrontend/MERGE +++ b/gcc/go/gofrontend/MERGE @@ -1,4 +1,4 @@ -d295a0a2c96c0f7c3abd94fea3aa4e2303bf2af2 +ff68b1a147eb60082fd60c198db0ef5477ade938 The first line of this file holds the git revision number of the last merge done from the gofrontend repository. diff --git a/libgo/sysinfo.c b/libgo/sysinfo.c index a4259c02ded4d618ae499e0ca133d643835cb473..fc0210992faa3a0608f06c5992f85a59ff7e04d4 100644 --- a/libgo/sysinfo.c +++ b/libgo/sysinfo.c @@ -158,9 +158,6 @@ #if defined(HAVE_LINUX_ETHER_H) #include <linux/ether.h> #endif -#if defined(HAVE_LINUX_FS_H) -#include <linux/fs.h> -#endif #if defined(HAVE_LINUX_REBOOT_H) #include <linux/reboot.h> #endif