ar71xx: refresh 3.2 patches
SVN-Revision: 30402
This commit is contained in:
parent
6959317691
commit
abeab97efc
2 changed files with 10 additions and 10 deletions
|
@ -558,7 +558,7 @@
|
|||
config ATH79_MACH_UBNT_XM
|
||||
bool "Ubiquiti Networks XM (rev 1.0) board"
|
||||
select SOC_AR724X
|
||||
@@ -67,6 +523,24 @@ config ATH79_MACH_UBNT_XM
|
||||
@@ -67,6 +513,24 @@ config ATH79_MACH_UBNT_XM
|
||||
Say 'Y' here if you want your kernel to support the
|
||||
Ubiquiti Networks XM (rev 1.0) board.
|
||||
|
||||
|
@ -583,7 +583,7 @@
|
|||
endmenu
|
||||
|
||||
config SOC_AR71XX
|
||||
@@ -96,10 +570,6 @@ config SOC_AR934X
|
||||
@@ -96,10 +560,6 @@ config SOC_AR934X
|
||||
select PCI_AR724X if PCI
|
||||
def_bool n
|
||||
|
||||
|
@ -594,7 +594,7 @@
|
|||
config ATH79_DEV_AP9X_PCI
|
||||
select ATH79_PCI_ATH9K_FIXUP
|
||||
def_bool n
|
||||
@@ -110,7 +580,14 @@ config ATH79_DEV_DSA
|
||||
@@ -110,7 +570,14 @@ config ATH79_DEV_DSA
|
||||
config ATH79_DEV_ETH
|
||||
def_bool n
|
||||
|
||||
|
@ -610,7 +610,7 @@
|
|||
def_bool n
|
||||
|
||||
config ATH79_DEV_GPIO_BUTTONS
|
||||
@@ -135,4 +612,7 @@ config ATH79_NVRAM
|
||||
@@ -135,4 +602,7 @@ config ATH79_NVRAM
|
||||
config ATH79_PCI_ATH9K_FIXUP
|
||||
def_bool n
|
||||
|
||||
|
|
|
@ -3,7 +3,7 @@ does not lock access between files.
|
|||
|
||||
--- a/drivers/mmc/host/gpiommc.c
|
||||
+++ b/drivers/mmc/host/gpiommc.c
|
||||
@@ -143,6 +143,8 @@ struct gpiommc_configfs_device {
|
||||
@@ -144,6 +144,8 @@ struct gpiommc_configfs_device {
|
||||
struct platform_device *pdev;
|
||||
/* The configuration */
|
||||
struct gpiommc_platform_data pdata;
|
||||
|
@ -12,7 +12,7 @@ does not lock access between files.
|
|||
};
|
||||
|
||||
#define GPIO_INVALID -1
|
||||
@@ -233,6 +235,8 @@ static ssize_t gpiommc_config_attr_show(
|
||||
@@ -234,6 +236,8 @@ static ssize_t gpiommc_config_attr_show(
|
||||
unsigned int gpio;
|
||||
int err = 0;
|
||||
|
||||
|
@ -21,7 +21,7 @@ does not lock access between files.
|
|||
if (attr == &gpiommc_attr_DI) {
|
||||
gpio = dev->pdata.pins.gpio_di;
|
||||
if (gpio == GPIO_INVALID)
|
||||
@@ -293,6 +297,8 @@ static ssize_t gpiommc_config_attr_show(
|
||||
@@ -294,6 +298,8 @@ static ssize_t gpiommc_config_attr_show(
|
||||
WARN_ON(1);
|
||||
err = -ENOSYS;
|
||||
out:
|
||||
|
@ -30,7 +30,7 @@ does not lock access between files.
|
|||
return err ? err : count;
|
||||
}
|
||||
|
||||
@@ -352,6 +358,8 @@ static ssize_t gpiommc_config_attr_store
|
||||
@@ -353,6 +359,8 @@ static ssize_t gpiommc_config_attr_store
|
||||
int err = -EINVAL;
|
||||
unsigned long data;
|
||||
|
||||
|
@ -39,7 +39,7 @@ does not lock access between files.
|
|||
if (attr == &gpiommc_attr_register) {
|
||||
err = strict_strtoul(page, 10, &data);
|
||||
if (err)
|
||||
@@ -477,6 +485,8 @@ static ssize_t gpiommc_config_attr_store
|
||||
@@ -478,6 +486,8 @@ static ssize_t gpiommc_config_attr_store
|
||||
WARN_ON(1);
|
||||
err = -ENOSYS;
|
||||
out:
|
||||
|
@ -48,7 +48,7 @@ does not lock access between files.
|
|||
return err ? err : count;
|
||||
}
|
||||
|
||||
@@ -513,6 +523,7 @@ static struct config_item *gpiommc_make_
|
||||
@@ -514,6 +524,7 @@ static struct config_item *gpiommc_make_
|
||||
if (!dev)
|
||||
return NULL;
|
||||
|
||||
|
|
Loading…
Reference in a new issue