pcmcia: at91_cf: move definitions locally (24c8a743) · Commits · 戴 / test

drivers/pcmcia/at91_cf.c

+11 −1

Original line number	Diff line number	Diff line
		@@ -13,7 +13,6 @@
		#include <linux/interrupt.h>
		#include <linux/slab.h>
		#include <linux/gpio.h>
		#include <linux/platform_data/atmel.h>
		#include <linux/io.h>
		#include <linux/sizes.h>
		#include <linux/mfd/syscon.h>
		@@ -35,6 +34,17 @@
		#define CF_IO_PHYS (1 << 23)
		#define CF_MEM_PHYS (0x017ff800)

		struct at91_cf_data {
		int irq_pin; /* I/O IRQ */
		int det_pin; /* Card detect */
		int vcc_pin; /* power switching */
		int rst_pin; /* card reset */
		u8 chipselect; /* EBI Chip Select number */
		u8 flags;
		#define AT91_CF_TRUE_IDE 0x01
		#define AT91_IDE_SWAP_A0_A2 0x02
		};

		struct regmap *mc;

		/--------------------------------------------------------------------------/

+0 −12

Original line number	Diff line number	Diff line
		@@ -6,18 +6,6 @@
		#ifndef __ATMEL_H__
		#define __ATMEL_H__

		/* Compact Flash */
		struct at91_cf_data {
		int irq_pin; /* I/O IRQ */
		int det_pin; /* Card detect */
		int vcc_pin; /* power switching */
		int rst_pin; /* card reset */
		u8 chipselect; /* EBI Chip Select number */
		u8 flags;
		#define AT91_CF_TRUE_IDE 0x01
		#define AT91_IDE_SWAP_A0_A2 0x02
		};

		/* FIXME: this needs a better location, but gets stuff building again */
		#ifdef CONFIG_ATMEL_PM
		extern int at91_suspend_entering_slow_clock(void);