Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 132a69c6 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 

* master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
  [SPARC64]: Fix parport_pc build.
  [SPARC64]: Update defconfig.
parents fb7d4045 74bd7d09

arch/sparc64/defconfig

+3 −2
Original line number Diff line number Diff line 
#

# Automatically generated make config: don't edit

# Linux kernel version: 2.6.21-rc1

# Mon Feb 26 10:45:21 2007

# Linux kernel version: 2.6.21-rc2

# Wed Feb 28 09:50:51 2007

#

CONFIG_SPARC=y

CONFIG_SPARC64=y
@@ -1219,6 +1219,7 @@ CONFIG_USB_HIDDEV=y 
# CONFIG_USB_SISUSBVGA is not set

# CONFIG_USB_LD is not set

# CONFIG_USB_TRANCEVIBRATOR is not set

# CONFIG_USB_IOWARRIOR is not set

# CONFIG_USB_TEST is not set



#

include/asm-sparc64/dma.h

+0 −4
Original line number Diff line number Diff line
@@ -205,10 +205,6 @@ do { u32 tmp = sbus_readl((__regs) + DMA_CSR); \ 
#define for_each_dvma(dma) \

        for((dma) = dma_chain; (dma); (dma) = (dma)->next)



extern int get_dma_list(char *);

extern int request_dma(unsigned int, __const__ char *);

extern void free_dma(unsigned int);



/* From PCI */



#ifdef CONFIG_PCI

include/asm-sparc64/parport.h

+22 −0
Original line number Diff line number Diff line
@@ -23,8 +23,30 @@ static struct sparc_ebus_info { 
	struct ebus_dma_info info;

	unsigned int addr;

	unsigned int count;

	int lock;

} sparc_ebus_dmas[PARPORT_PC_MAX_PORTS];



static __inline__ int request_dma(unsigned int dmanr, const char *device_id)

{

	if (dmanr >= PARPORT_PC_MAX_PORTS)

		return -EINVAL;

	if (xchg(&sparc_ebus_dmas[dmanr].lock, 1) != 0)

		return -EBUSY;

	return 0;

}



static __inline__ void free_dma(unsigned int dmanr)

{

	if (dmanr >= PARPORT_PC_MAX_PORTS) {

		printk(KERN_WARNING "Trying to free DMA%d\n", dmanr);

		return;

	}

	if (xchg(&sparc_ebus_dmas[dmanr].lock, 0) == 0) {

		printk(KERN_WARNING "Trying to free free DMA%d\n", dmanr);

		return;

	}	

}



static __inline__ void enable_dma(unsigned int dmanr)

{

	ebus_dma_enable(&sparc_ebus_dmas[dmanr].info, 1);