9b487dbc298242fdde127e7827e728545c308aac diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE index 7c5c45672d7..5ea0406cd8e 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 a4259c02ded..fc0210992fa 100644 --- a/libgo/sysinfo.c +++ b/libgo/sysinfo.c @@ -158,9 +158,6 @@ #if defined(HAVE_LINUX_ETHER_H) #include #endif -#if defined(HAVE_LINUX_FS_H) -#include -#endif #if defined(HAVE_LINUX_REBOOT_H) #include #endif