From bf2783a016b31f89c8b011c2be0ca911b0c3146c Mon Sep 17 00:00:00 2001
From: "David E. O'Brien" <obrien@FreeBSD.org>
Date: Fri, 2 May 2003 06:49:10 +0000
Subject: [PATCH] Use __FBSDID.

---
 sbin/camcontrol/camcontrol.c | 5 +++--
 sbin/camcontrol/modeedit.c   | 6 ++----
 sbin/camcontrol/util.c       | 6 ++----
 3 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/sbin/camcontrol/camcontrol.c b/sbin/camcontrol/camcontrol.c
index dda3c7d1817c..54e6d1becf53 100644
--- a/sbin/camcontrol/camcontrol.c
+++ b/sbin/camcontrol/camcontrol.c
@@ -24,10 +24,11 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/ioctl.h>
 #include <sys/stdint.h>
 #include <sys/types.h>
diff --git a/sbin/camcontrol/modeedit.c b/sbin/camcontrol/modeedit.c
index c8dd20ab9afb..88ed1b7674ea 100644
--- a/sbin/camcontrol/modeedit.c
+++ b/sbin/camcontrol/modeedit.c
@@ -26,10 +26,8 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef lint
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif /* not lint */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include <sys/queue.h>
 #include <sys/types.h>
diff --git a/sbin/camcontrol/util.c b/sbin/camcontrol/util.c
index 272d2a1b3d63..9f0a752a03df 100644
--- a/sbin/camcontrol/util.c
+++ b/sbin/camcontrol/util.c
@@ -43,10 +43,8 @@
  * Taken from the original scsi(8) program.
  * from: scsi.c,v 1.17 1998/01/12 07:57:57 charnier Exp $";
  */
-#ifndef lint
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif /* not lint */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include <sys/stdint.h>
 #include <sys/types.h>