From 660a71b93bda0e6d11ff0a9e4c6c8994dcd53c6f Mon Sep 17 00:00:00 2001
From: Roland McGrath <roland@gnu.org>
Date: Sun, 8 Jan 2006 06:50:00 +0000
Subject: [PATCH] Update abandoned code for sysdeps/generic demise.

---
 sysdeps/am29k/ffs.c              | 4 ++--
 sysdeps/i960/ffs.c               | 4 ++--
 sysdeps/m88k/ffs.c               | 4 ++--
 sysdeps/unix/bsd/sun/sethostid.c | 2 +-
 sysdeps/unix/sysv/irix4/reboot.c | 2 +-
 sysdeps/unix/sysv/irix4/swapon.c | 2 +-
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/sysdeps/am29k/ffs.c b/sysdeps/am29k/ffs.c
index 6f080db442..9abd2c6bca 100644
--- a/sysdeps/am29k/ffs.c
+++ b/sysdeps/am29k/ffs.c
@@ -1,6 +1,6 @@
 /* ffs -- find first set bit in a word, counted from least significant end.
    For Amd 290x0.
-   Copyright (C) 1991, 1992, 1997, 2004 Free Software Foundation, Inc.
+   Copyright (C) 1991, 1992, 1997, 2004, 2005 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Torbjorn Granlund (tege@sics.se).
 
@@ -39,5 +39,5 @@ weak_alias (__ffs, ffs)
 libc_hidden_builtin_def (ffs)
 
 #else
-#include <sysdeps/generic/ffs.c>
+#include <string/ffs.c>
 #endif
diff --git a/sysdeps/i960/ffs.c b/sysdeps/i960/ffs.c
index ad907a4ecb..090d1148b5 100644
--- a/sysdeps/i960/ffs.c
+++ b/sysdeps/i960/ffs.c
@@ -1,7 +1,7 @@
 /* ffs -- find first set bit in a word, counted from least significant end.
    For i960 Core architecture
    This file is part of the GNU C Library.
-   Copyright (C) 1994, 1997, 2004 Free Software Foundation, Inc.
+   Copyright (C) 1994, 1997, 2004, 2005 Free Software Foundation, Inc.
    Contributed by Joel Sherrill (jsherril@redstone-emh2.army.mil),
    On-Line Applications Research Corporation.
 
@@ -41,6 +41,6 @@ libc_hidden_builtin_def (ffs)
 
 #else
 
-#include <sysdeps/generic/ffs.c>
+#include <string/ffs.c>
 
 #endif
diff --git a/sysdeps/m88k/ffs.c b/sysdeps/m88k/ffs.c
index b7db70fd3b..9381f54b0b 100644
--- a/sysdeps/m88k/ffs.c
+++ b/sysdeps/m88k/ffs.c
@@ -1,7 +1,7 @@
 /* ffs -- find first set bit in a word, counted from least significant end.
    For Motorola 88000.
    This file is part of the GNU C Library.
-   Copyright (C) 1991, 1992, 1997, 2004 Free Software Foundation, Inc.
+   Copyright (C) 1991, 1992, 1997, 2004, 2005 Free Software Foundation, Inc.
    Contributed by Torbjorn Granlund (tege@sics.se).
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -41,5 +41,5 @@ weak_alias (__ffs, ffs)
 libc_hidden_builtin_def (ffs)
 
 #else
-#include <sysdeps/generic/ffs.c>
+#include <string/ffs.c>
 #endif
diff --git a/sysdeps/unix/bsd/sun/sethostid.c b/sysdeps/unix/bsd/sun/sethostid.c
index aeb2940f42..6c0d39db5c 100644
--- a/sysdeps/unix/bsd/sun/sethostid.c
+++ b/sysdeps/unix/bsd/sun/sethostid.c
@@ -1 +1 @@
-#include <sysdeps/generic/sethostid.c>
+#include <misc/sethostid.c>
diff --git a/sysdeps/unix/sysv/irix4/reboot.c b/sysdeps/unix/sysv/irix4/reboot.c
index 4d90e6fc56..7c9dbba770 100644
--- a/sysdeps/unix/sysv/irix4/reboot.c
+++ b/sysdeps/unix/sysv/irix4/reboot.c
@@ -1 +1 @@
-#include <sysdeps/generic/reboot.c>
+#include <misc/reboot.c>
diff --git a/sysdeps/unix/sysv/irix4/swapon.c b/sysdeps/unix/sysv/irix4/swapon.c
index 54885a883e..43c5222a43 100644
--- a/sysdeps/unix/sysv/irix4/swapon.c
+++ b/sysdeps/unix/sysv/irix4/swapon.c
@@ -1 +1 @@
-#include <sysdeps/generic/swapon.c>
+#include <misc/swapon.c>