diff options
Diffstat (limited to 'usr/src/uts/i86pc')
| -rw-r--r-- | usr/src/uts/i86pc/acpippm/Makefile | 8 | ||||
| -rw-r--r-- | usr/src/uts/i86pc/cpr/Makefile | 9 | ||||
| -rw-r--r-- | usr/src/uts/i86pc/io/ppm/acpippm.c | 3 | ||||
| -rw-r--r-- | usr/src/uts/i86pc/io/rootnex.c | 5 | ||||
| -rw-r--r-- | usr/src/uts/i86pc/rootnex/Makefile | 5 |
5 files changed, 16 insertions, 14 deletions
diff --git a/usr/src/uts/i86pc/acpippm/Makefile b/usr/src/uts/i86pc/acpippm/Makefile index 2731469730..5844ddfca1 100644 --- a/usr/src/uts/i86pc/acpippm/Makefile +++ b/usr/src/uts/i86pc/acpippm/Makefile @@ -23,8 +23,7 @@ # # Copyright 2007 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. -# -#ident "%Z%%M% %I% %E% SMI" +# Copyright (c) 2011 Bayard G. Bell. All rights reserved. # # This makefile drives the production of the power managment # module for the ACPI subsystem @@ -65,6 +64,11 @@ INSTALL_TARGET = $(BINARY) $(ROOTMODULE) $(ROOT_CONFFILE) CFLAGS += $(CCVERBOSE) # +# Declare dependency on misc/acpica +# +LDFLAGS += -dy -N misc/acpica + +# # Default build targets. # .KEEP_STATE: diff --git a/usr/src/uts/i86pc/cpr/Makefile b/usr/src/uts/i86pc/cpr/Makefile index 115b4d0800..7e07865e48 100644 --- a/usr/src/uts/i86pc/cpr/Makefile +++ b/usr/src/uts/i86pc/cpr/Makefile @@ -22,8 +22,7 @@ # uts/i86pc/cpr/Makefile # Copyright 2007 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. -# -#ident "%Z%%M% %I% %E% SMI" +# Copyright (c) 2011 Bayard G. Bell. All rights reserved. # # This makefile drives the production of the cpr misc kernel module. # @@ -55,9 +54,11 @@ ROOTMODULE = $(ROOT_PSM_MISC_DIR)/$(MODULE) include $(UTSBASE)/i86pc/Makefile.i86pc # -# Override defaults +# bootdev required as per previous inline commenting referencing symbol +# i_devname_to_promname(), which may only be necessary on SPARC. Removing +# this symbol may be sufficient to remove depedency. # -LDFLAGS += -dy -N misc/acpica +LDFLAGS += -dy -N misc/acpica -N misc/bootdev # # Define targets diff --git a/usr/src/uts/i86pc/io/ppm/acpippm.c b/usr/src/uts/i86pc/io/ppm/acpippm.c index f5c9004220..476be5fdfb 100644 --- a/usr/src/uts/i86pc/io/ppm/acpippm.c +++ b/usr/src/uts/i86pc/io/ppm/acpippm.c @@ -22,6 +22,7 @@ /* * Copyright 2008 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. + * Copyright (c) 2011 Bayard G. Bell. All rights reserved. */ #include <sys/types.h> @@ -139,8 +140,6 @@ static kmutex_t appm_lock; /* * S3 stuff: */ -char _depends_on[] = "misc/acpica"; - extern int acpi_enter_sleepstate(s3a_t *); extern int acpi_exit_sleepstate(s3a_t *); diff --git a/usr/src/uts/i86pc/io/rootnex.c b/usr/src/uts/i86pc/io/rootnex.c index c538d6d2b7..ab2ffb503e 100644 --- a/usr/src/uts/i86pc/io/rootnex.c +++ b/usr/src/uts/i86pc/io/rootnex.c @@ -23,6 +23,7 @@ */ /* * Copyright 2011 Nexenta Systems, Inc. All rights reserved. + * Copyright (c) 2011 Bayard G. Bell. All rights reserved. */ /* @@ -167,10 +168,6 @@ typedef paddr_t rootnex_addr_t; #define ROOTNEX_PADDR_TO_RBASE(pa) (pa) #endif -#if !defined(__xpv) -char _depends_on[] = "misc/iommulib misc/acpica"; -#endif - static struct cb_ops rootnex_cb_ops = { nodev, /* open */ nodev, /* close */ diff --git a/usr/src/uts/i86pc/rootnex/Makefile b/usr/src/uts/i86pc/rootnex/Makefile index 8f7ea9f7f1..2ef85546b3 100644 --- a/usr/src/uts/i86pc/rootnex/Makefile +++ b/usr/src/uts/i86pc/rootnex/Makefile @@ -21,6 +21,7 @@ # # uts/i86pc/rootnex/Makefile # Copyright 2010 Sun Microsystems, Inc. All rights reserved. +# Copyright (c) 2011 Bayard G. Bell. All rights reserved. # Use is subject to license terms. # # This makefile drives the production of the rootnex driver @@ -55,9 +56,9 @@ LINT_TARGET = $(MODULE).lint INSTALL_TARGET = $(BINARY) $(ROOTMODULE) $(ROOT_CONFFILE) # -# Overrides. +# Define dependencies on iommulib and acpica # -LDFLAGS += -dy +LDFLAGS += -dy -N misc/iommulib -N misc/acpica # # For now, disable these lint checks; maintainers should endeavor |