diff --git a/[refs] b/[refs] index 32733cf8adad..8af6ecd8c01e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: dc10f6119636a5ff13b633e722e720fe0253202b +refs/heads/master: 21f45eb1d381aad30094751c60ae8171d6223a66 diff --git a/trunk/include/asm-parisc/ide.h b/trunk/include/asm-parisc/ide.h index c246ef75017d..81700a2321cf 100644 --- a/trunk/include/asm-parisc/ide.h +++ b/trunk/include/asm-parisc/ide.h @@ -13,10 +13,6 @@ #ifdef __KERNEL__ -#define ide_request_irq(irq,hand,flg,dev,id) request_irq((irq),(hand),(flg),(dev),(id)) -#define ide_free_irq(irq,dev_id) free_irq((irq), (dev_id)) -#define ide_request_region(from,extent,name) request_region((from), (extent), (name)) -#define ide_release_region(from,extent) release_region((from), (extent)) /* Generic I/O and MEMIO string operations. */ #define __ide_insw insw