projects
/
openwrt
/
svn-archive
/
archive.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
atheros: v3.18: cleanup includes
[openwrt/svn-archive/archive.git]
/
target
/
linux
/
atheros
/
patches-3.18
/
120-spiflash.patch
diff --git
a/target/linux/atheros/patches-3.18/120-spiflash.patch
b/target/linux/atheros/patches-3.18/120-spiflash.patch
index 06fe09c25318f875ea402ee697c3fc1ef5883da3..7d88ee217054bb84668aa15ba1eb92c3b412e8a6 100644
(file)
--- a/
target/linux/atheros/patches-3.18/120-spiflash.patch
+++ b/
target/linux/atheros/patches-3.18/120-spiflash.patch
@@
-594,7
+594,7
@@
+#endif
--- a/arch/mips/ath25/ar2315.c
+++ b/arch/mips/ath25/ar2315.c
+#endif
--- a/arch/mips/ath25/ar2315.c
+++ b/arch/mips/ath25/ar2315.c
-@@ -22
5,6 +225
,28 @@ static struct platform_device ar2315_gpi
+@@ -22
0,6 +220
,28 @@ static struct platform_device ar2315_gpi
.num_resources = ARRAY_SIZE(ar2315_gpio_res)
};
.num_resources = ARRAY_SIZE(ar2315_gpio_res)
};
@@
-623,7
+623,7
@@
void __init ar2315_init_devices(void)
{
/* Find board configuration */
void __init ar2315_init_devices(void)
{
/* Find board configuration */
-@@ -23
5,6 +257
,8 @@ void __init ar2315_init_devices(void)
+@@ -23
0,6 +252
,8 @@ void __init ar2315_init_devices(void)
ar2315_gpio_res[1].end = ar2315_gpio_res[1].start;
platform_device_register(&ar2315_gpio);
ar2315_gpio_res[1].end = ar2315_gpio_res[1].start;
platform_device_register(&ar2315_gpio);