svn commit: r232073 - head/sys/conf

[Dimitry Andric]

Author: dim
Date: Thu Feb 23 21:32:32 2012
New Revision: 232073
URL: http://svn.freebsd.org/changeset/base/232073

Log:
  Revert r231978, so I can apply a more proper fix to silence unneeded
  internal declaration warnings in several sys/cam/ctl files.
  
  MFC after:	1 week

Modified:
  head/sys/conf/files
  head/sys/conf/kern.mk

Modified: head/sys/conf/files
==============================================================================
--- head/sys/conf/files	Thu Feb 23 21:08:21 2012	(r232072)
+++ head/sys/conf/files	Thu Feb 23 21:32:32 2012	(r232073)
@@ -116,21 +116,16 @@ cam/scsi/scsi_cd.c		optional cd
 cam/scsi/scsi_ch.c		optional ch
 cam/ata/ata_da.c		optional ada | da
 cam/ctl/ctl.c			optional ctl
-cam/ctl/ctl_backend.c		optional ctl \
-	compile-with "${NORMAL_C} ${NO_WUNNEEDED_INTERNAL_DECL}"
+cam/ctl/ctl_backend.c		optional ctl
 cam/ctl/ctl_backend_block.c	optional ctl
 cam/ctl/ctl_backend_ramdisk.c	optional ctl
-cam/ctl/ctl_cmd_table.c		optional ctl \
-	compile-with "${NORMAL_C} ${NO_WUNNEEDED_INTERNAL_DECL}"
-cam/ctl/ctl_frontend.c		optional ctl \
-	compile-with "${NORMAL_C} ${NO_WUNNEEDED_INTERNAL_DECL}"
+cam/ctl/ctl_cmd_table.c		optional ctl
+cam/ctl/ctl_frontend.c		optional ctl
 cam/ctl/ctl_frontend_cam_sim.c	optional ctl
-cam/ctl/ctl_frontend_internal.c	optional ctl \
-	compile-with "${NORMAL_C} ${NO_WUNNEEDED_INTERNAL_DECL}"
+cam/ctl/ctl_frontend_internal.c	optional ctl
 cam/ctl/ctl_mem_pool.c		optional ctl
 cam/ctl/ctl_scsi_all.c		optional ctl
-cam/ctl/ctl_error.c		optional ctl \
-	compile-with "${NORMAL_C} ${NO_WUNNEEDED_INTERNAL_DECL}"
+cam/ctl/ctl_error.c		optional ctl
 cam/ctl/ctl_util.c		optional ctl
 cam/ctl/scsi_ctl.c		optional ctl
 cam/scsi/scsi_da.c		optional da

Modified: head/sys/conf/kern.mk
==============================================================================
--- head/sys/conf/kern.mk	Thu Feb 23 21:08:21 2012	(r232072)
+++ head/sys/conf/kern.mk	Thu Feb 23 21:32:32 2012	(r232073)
@@ -22,7 +22,6 @@ NO_WSHIFT_COUNT_NEGATIVE=	-Wno-shift-cou
 NO_WSHIFT_COUNT_OVERFLOW=	-Wno-shift-count-overflow
 NO_WUNUSED_VALUE=		-Wno-unused-value
 NO_WSELF_ASSIGN=		-Wno-self-assign
-NO_WUNNEEDED_INTERNAL_DECL=	-Wno-unneeded-internal-declaration
 NO_WFORMAT_SECURITY=		-Wno-format-security
 # Several other warnings which might be useful in some cases, but not severe
 # enough to error out the whole kernel build.  Display them anyway, so there is