path: root/arch/mips/include/asm
diff options
authorLinus Torvalds <torvalds@linux-foundation.org>2018-12-28 14:06:43 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2018-12-28 14:06:43 -0800
commitfe2b0cdabcd9e6aeca66a104bc03576946e5fee2 (patch)
tree3abffb169919155a4039188f7262c9fd9c64457d /arch/mips/include/asm
parent956eb6cb36765e3a79a744e6c9364dab1548e460 (diff)
parent9f83cfdb1ace3ef268ecc6fda50058d2ec37d603 (diff)
Merge tag 'for-4.21/libata-20181221' of git://git.kernel.dk/linux-block
Pull libata updates from Jens Axboe: "Here are the libata changes for this merge window. Nothing major in here. This contains: - GPIO descriptor conversions (Linus Walleij) - rcar deferred probing fix (Sergei Shtylyov)" * tag 'for-4.21/libata-20181221' of git://git.kernel.dk/linux-block: sata_rcar: fix deferred probing ata: palmld: Introduce state container ata: palmld: Convert to GPIO descriptors ata: rb532_cf: Convert to use GPIO descriptors ata: sata_highbank: Convert to use GPIO descriptors ata: pxa: Drop <linux/gpio.h> include
Diffstat (limited to 'arch/mips/include/asm')
1 files changed, 0 insertions, 6 deletions
diff --git a/arch/mips/include/asm/mach-rc32434/rb.h b/arch/mips/include/asm/mach-rc32434/rb.h
index aac8ce8902e7..5dfd4d66d6fc 100644
--- a/arch/mips/include/asm/mach-rc32434/rb.h
+++ b/arch/mips/include/asm/mach-rc32434/rb.h
@@ -71,12 +71,6 @@ struct korina_device {
struct net_device *dev;
-struct cf_device {
- int gpio_pin;
- void *dev;
- struct gendisk *gd;
struct mpmc_device {
unsigned char state;
spinlock_t lock;