Update of /cvsroot/linuxconsole/ruby/linux/include/asm-ppc
In directory usw-pr-cvs1:/tmp/cvs-serv30808
Modified Files:
machdep.h
Removed Files:
vga.h
Log Message:
Sync machdep.h with dj.
Remove vga.h, problem solved elsewhere.
Index: machdep.h
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/include/asm-ppc/machdep.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- machdep.h 2001/12/26 17:28:12 1.3
+++ machdep.h 2002/02/01 22:02:58 1.4
@@ -1,5 +1,5 @@
/*
- * BK Id: SCCS/s.machdep.h 1.25 11/13/01 21:26:07 paulus
+ * BK Id: SCCS/s.machdep.h 1.28 12/27/01 10:08:52 trini
*/
#ifdef __KERNEL__
#ifndef _PPC_MACHDEP_H
@@ -16,6 +16,11 @@
struct pci_dev;
struct seq_file;
+/* We export this macro for external modules like Alsa to know if
+ * ppc_md.feature_call is implemented or not
+ */
+#define CONFIG_PPC_HAS_FEATURE_CALLS
+
struct machdep_calls {
void (*setup_arch)(void);
/* Optional, may be NULL. */
@@ -82,6 +87,12 @@
/* this is for modules, since _machine can be a define -- Cort */
int ppc_machine;
+
+ /* Motherboard/chipset features. This is a kind of general purpose
+ * hook used to control some machine specific features (like reset
+ * lines, chip power control, etc...).
+ */
+ int (*feature_call)(unsigned int feature, ...);
#ifdef CONFIG_SMP
/* functions for dealing with other cpus */
--- vga.h DELETED ---
|
