diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-04-19 12:17:29 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-04-19 12:17:29 -0400 |
| commit | adf6d34e460387ee3e8f1e1875d52bff51212c7d (patch) | |
| tree | 88ef100143e6184103a608f82dfd232bf6376eaf /drivers/net/wireless/arlan-proc.c | |
| parent | d1964dab60ce7c104dd21590e987a8787db18051 (diff) | |
| parent | 3760d31f11bfbd0ead9eaeb8573e0602437a9d7c (diff) | |
Merge branch 'omap2-upstream' into devel
Diffstat (limited to 'drivers/net/wireless/arlan-proc.c')
| -rw-r--r-- | drivers/net/wireless/arlan-proc.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/drivers/net/wireless/arlan-proc.c b/drivers/net/wireless/arlan-proc.c index c6e70dbc5de8..2ab1d59870f4 100644 --- a/drivers/net/wireless/arlan-proc.c +++ b/drivers/net/wireless/arlan-proc.c | |||
| @@ -1202,13 +1202,6 @@ static ctl_table arlan_table[MAX_ARLANS + 1] = | |||
| 1202 | { .ctl_name = 0 } | 1202 | { .ctl_name = 0 } |
| 1203 | }; | 1203 | }; |
| 1204 | #endif | 1204 | #endif |
| 1205 | #else | ||
| 1206 | |||
| 1207 | static ctl_table arlan_table[MAX_ARLANS + 1] = | ||
| 1208 | { | ||
| 1209 | { .ctl_name = 0 } | ||
| 1210 | }; | ||
| 1211 | #endif | ||
| 1212 | 1205 | ||
| 1213 | 1206 | ||
| 1214 | // static int mmtu = 1234; | 1207 | // static int mmtu = 1234; |
| @@ -1233,7 +1226,6 @@ static ctl_table arlan_root_table[] = | |||
| 1233 | //}; | 1226 | //}; |
| 1234 | 1227 | ||
| 1235 | 1228 | ||
| 1236 | #ifdef CONFIG_PROC_FS | ||
| 1237 | static struct ctl_table_header *arlan_device_sysctl_header; | 1229 | static struct ctl_table_header *arlan_device_sysctl_header; |
| 1238 | 1230 | ||
| 1239 | int __init init_arlan_proc(void) | 1231 | int __init init_arlan_proc(void) |