diff options
-rw-r--r-- | arch/arm/plat-samsung/include/plat/fiq.h | 13 | ||||
-rw-r--r-- | drivers/spi/spi-s3c24xx.c | 2 | ||||
-rw-r--r-- | include/linux/spi/s3c24xx.h | 2 |
3 files changed, 2 insertions, 15 deletions
diff --git a/arch/arm/plat-samsung/include/plat/fiq.h b/arch/arm/plat-samsung/include/plat/fiq.h deleted file mode 100644 index 535d06a35628..000000000000 --- a/arch/arm/plat-samsung/include/plat/fiq.h +++ /dev/null | |||
@@ -1,13 +0,0 @@ | |||
1 | /* linux/arch/arm/plat-samsung/include/plat/fiq.h | ||
2 | * | ||
3 | * Copyright (c) 2009 Simtec Electronics | ||
4 | * Ben Dooks <ben@simtec.co.uk> | ||
5 | * | ||
6 | * Header file for S3C24XX CPU FIQ support | ||
7 | * | ||
8 | * This program is free software; you can redistribute it and/or modify | ||
9 | * it under the terms of the GNU General Public License version 2 as | ||
10 | * published by the Free Software Foundation. | ||
11 | */ | ||
12 | |||
13 | extern int s3c24xx_set_fiq(unsigned int irq, bool on); | ||
diff --git a/drivers/spi/spi-s3c24xx.c b/drivers/spi/spi-s3c24xx.c index 2ccb28d57ba9..746424aa5353 100644 --- a/drivers/spi/spi-s3c24xx.c +++ b/drivers/spi/spi-s3c24xx.c | |||
@@ -29,7 +29,6 @@ | |||
29 | 29 | ||
30 | #include <plat/regs-spi.h> | 30 | #include <plat/regs-spi.h> |
31 | 31 | ||
32 | #include <plat/fiq.h> | ||
33 | #include <asm/fiq.h> | 32 | #include <asm/fiq.h> |
34 | 33 | ||
35 | #include "spi-s3c24xx-fiq.h" | 34 | #include "spi-s3c24xx-fiq.h" |
@@ -84,7 +83,6 @@ struct s3c24xx_spi { | |||
84 | struct s3c2410_spi_info *pdata; | 83 | struct s3c2410_spi_info *pdata; |
85 | }; | 84 | }; |
86 | 85 | ||
87 | |||
88 | #define SPCON_DEFAULT (S3C2410_SPCON_MSTR | S3C2410_SPCON_SMOD_INT) | 86 | #define SPCON_DEFAULT (S3C2410_SPCON_MSTR | S3C2410_SPCON_SMOD_INT) |
89 | #define SPPIN_DEFAULT (S3C2410_SPPIN_KEEP) | 87 | #define SPPIN_DEFAULT (S3C2410_SPPIN_KEEP) |
90 | 88 | ||
diff --git a/include/linux/spi/s3c24xx.h b/include/linux/spi/s3c24xx.h index c23b923e493b..ca271c06c591 100644 --- a/include/linux/spi/s3c24xx.h +++ b/include/linux/spi/s3c24xx.h | |||
@@ -23,4 +23,6 @@ struct s3c2410_spi_info { | |||
23 | void (*set_cs)(struct s3c2410_spi_info *spi, int cs, int pol); | 23 | void (*set_cs)(struct s3c2410_spi_info *spi, int cs, int pol); |
24 | }; | 24 | }; |
25 | 25 | ||
26 | extern int s3c24xx_set_fiq(unsigned int irq, bool on); | ||
27 | |||
26 | #endif /* __LINUX_SPI_S3C24XX_H */ | 28 | #endif /* __LINUX_SPI_S3C24XX_H */ |