*** empty log message ***

diff --git a/comedi/drivers/adl_pci9118.c b/comedi/drivers/adl_pci9118.c
index 7abb02cea4e2fc320c3d34b1e903e2d3210955cc..b9ef3157792265510ea63a622bc9cd5964fb118d 100644 (file)
--- a/comedi/drivers/adl_pci9118.c
+++ b/comedi/drivers/adl_pci9118.c
@@ -76,7 +76,7 @@ Configuration options:
 #include <linux/timer.h>
 #include <linux/pci.h>
 #include <asm/io.h>
-#include <asm/byteorder.h>
+//#include <asm/byteorder.h>
 #include <linux/comedidev.h>
 #include "amcc_s5933.h"
 #include "8253.h"

diff --git a/comedi/drivers/ni_pcimio.c b/comedi/drivers/ni_pcimio.c
index 07db3c84432c4f53d7dfc8cd695812b202146d9f..acce5744e8320fa533a7cdbffd5d82fe22e0efe8 100644 (file)
--- a/comedi/drivers/ni_pcimio.c
+++ b/comedi/drivers/ni_pcimio.c
@@ -316,7 +316,7 @@ static ni_board ni_boards[]={
                n_aochan:       0,
                aobits:         0,
                ao_unipolar:    0,
-               caldac:         {mb88341},
+               caldac:         {ad8804}, /* manual is wrong */
                has_8255:       0,
        },
        {       device_id:      0x2a70,
@@ -331,7 +331,7 @@ static ni_board ni_boards[]={
                aobits:         12,
                ao_fifo_depth:  0,
                ao_unipolar:    0,
-               caldac:         {mb88341},
+               caldac:         {ad8804}, /* manual is wrong */
                has_8255:       0,
        },
        {       device_id:      0x2a80,
@@ -346,7 +346,7 @@ static ni_board ni_boards[]={
                aobits:         12,
                ao_fifo_depth:  0,
                ao_unipolar:    0,
-               caldac:         {mb88341},
+               caldac:         {ad8804}, /* manual is wrong */
                has_8255:       1,
        },
        {       device_id:      0x2ab0,
@@ -361,7 +361,7 @@ static ni_board ni_boards[]={
                aobits:         12,
                ao_fifo_depth:  0,
                ao_unipolar:    1,
-               caldac:         {mb88341},
+               caldac:         {ad8804}, /* manual is wrong */
                has_8255:       1,
        },