Commit 845c28d8 authored by David S. Miller's avatar David S. Miller

Merge nuts.davemloft.net:/disk1/BK/sparcwork-2.6

into nuts.davemloft.net:/disk1/BK/sparc-2.6
parents 99202312 91096a17
...@@ -222,14 +222,14 @@ Here is pseudo-code showing how this might be done: ...@@ -222,14 +222,14 @@ Here is pseudo-code showing how this might be done:
struct pci_dev *pdev; struct pci_dev *pdev;
... ...
if (pci_set_dma_mask(pdev, PLAYBACK_ADDRESS_BITS)) { if (!pci_set_dma_mask(pdev, PLAYBACK_ADDRESS_BITS)) {
card->playback_enabled = 1; card->playback_enabled = 1;
} else { } else {
card->playback_enabled = 0; card->playback_enabled = 0;
printk(KERN_WARN "%s: Playback disabled due to DMA limitations.\n", printk(KERN_WARN "%s: Playback disabled due to DMA limitations.\n",
card->name); card->name);
} }
if (pci_set_dma_mask(pdev, RECORD_ADDRESS_BITS)) { if (!pci_set_dma_mask(pdev, RECORD_ADDRESS_BITS)) {
card->record_enabled = 1; card->record_enabled = 1;
} else { } else {
card->record_enabled = 0; card->record_enabled = 0;
......
#ifndef _SPARC_OPENPROMIO_H #ifndef _SPARC_OPENPROMIO_H
#define _SPARC_OPENPROMIO_H #define _SPARC_OPENPROMIO_H
#include <linux/compiler.h>
#include <linux/ioctl.h> #include <linux/ioctl.h>
#include <linux/types.h> #include <linux/types.h>
...@@ -52,9 +53,9 @@ struct opiocdesc ...@@ -52,9 +53,9 @@ struct opiocdesc
{ {
int op_nodeid; /* PROM Node ID (value-result) */ int op_nodeid; /* PROM Node ID (value-result) */
int op_namelen; /* Length of op_name. */ int op_namelen; /* Length of op_name. */
char *op_name; /* Pointer to the property name. */ char __user *op_name; /* Pointer to the property name. */
int op_buflen; /* Length of op_buf (value-result) */ int op_buflen; /* Length of op_buf (value-result) */
char *op_buf; /* Pointer to buffer. */ char __user *op_buf; /* Pointer to buffer. */
}; };
#define OPIOCGET _IOWR('O', 1, struct opiocdesc) #define OPIOCGET _IOWR('O', 1, struct opiocdesc)
......
#ifndef _SPARC64_OPENPROMIO_H #ifndef _SPARC64_OPENPROMIO_H
#define _SPARC64_OPENPROMIO_H #define _SPARC64_OPENPROMIO_H
#include <linux/compiler.h>
#include <linux/ioctl.h> #include <linux/ioctl.h>
#include <linux/types.h> #include <linux/types.h>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment