projects
/
firefly-linux-kernel-4.4.55.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
35d98a8
)
Revert "Add flags parameter to get_country_code template"
author
hwg
<hwg@rock-chips.com>
Sun, 22 Mar 2015 02:34:43 +0000
(10:34 +0800)
committer
hwg
<hwg@rock-chips.com>
Sun, 22 Mar 2015 02:58:28 +0000
(10:58 +0800)
This reverts commit
a3d5a3f5affd45d9aa21daf04d4eb543fd3ed444
.
Conflicts:
include/linux/wlan_plat.h
include/linux/wlan_plat.h
patch
|
blob
|
history
diff --git
a/include/linux/wlan_plat.h
b/include/linux/wlan_plat.h
index 8e8b06f1ba4ae3eb5ec51ffa97e97e74d06fadb3..fa961ef6f4903a176bc4f63f4b67fc413bc9603d 100644
(file)
--- a/
include/linux/wlan_plat.h
+++ b/
include/linux/wlan_plat.h
@@
-15,8
+15,6
@@
#ifndef _LINUX_WLAN_PLAT_H_
#define _LINUX_WLAN_PLAT_H_
-#define WLAN_PLAT_NODFS_FLAG 0x01
-
struct wifi_platform_data {
int (*set_power)(int val);
int (*set_reset)(int val);
@@
-24,7
+22,7
@@
struct wifi_platform_data {
void *(*mem_prealloc)(int section, unsigned long size);
int (*get_mac_addr)(unsigned char *buf);
int (*get_wake_irq)(void);
- void *(*get_country_code)(char *ccode
, u32 flags
);
+ void *(*get_country_code)(char *ccode);
};
#endif