diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-05-07 15:03:53 +1000 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-05-07 15:03:53 +1000 |
commit | 8e4e9eca1099ba69893511d21bb09fa25163218a (patch) | |
tree | ec6d6ac99bb1e854c1ebea5356f0f9be90142a65 /drivers/staging/crystalhd/crystalhd_lnx.h | |
parent | 8a95ccb08f38db0371634dbf1e34a5094ff00c6e (diff) | |
parent | c1cfeb2b7e86543897b250717bcd4ae7c8f8a6b9 (diff) |
Merge remote branch 'staging-next/staging-next'
Conflicts:
drivers/staging/arlan/arlan-main.c
drivers/staging/comedi/drivers/cb_das16_cs.c
drivers/staging/cx25821/cx25821-alsa.c
drivers/staging/dt3155/dt3155_drv.c
drivers/staging/hv/hv.c
drivers/staging/netwave/netwave_cs.c
drivers/staging/wavelan/wavelan.c
drivers/staging/wavelan/wavelan_cs.c
Diffstat (limited to 'drivers/staging/crystalhd/crystalhd_lnx.h')
-rw-r--r-- | drivers/staging/crystalhd/crystalhd_lnx.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/staging/crystalhd/crystalhd_lnx.h b/drivers/staging/crystalhd/crystalhd_lnx.h index d338ae97a4cf..eee4926f04ea 100644 --- a/drivers/staging/crystalhd/crystalhd_lnx.h +++ b/drivers/staging/crystalhd/crystalhd_lnx.h @@ -42,11 +42,11 @@ #include <linux/pagemap.h> #include <linux/vmalloc.h> -#include <asm/io.h> +#include <linux/io.h> #include <asm/irq.h> #include <asm/pgtable.h> #include <asm/system.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include "crystalhd_cmds.h" |