Revert "wlan: Extract generic wlan platform data from tiwlan specific header"

This reverts commit 275f83d836c2bbb13288eaa822c2e833e0e02e38.

diff --git a/include/linux/wifi_tiwlan.h b/include/linux/wifi_tiwlan.h
index f07e0679fb8281d1121294f627f0a638ec57f940..5897e726c4f9e1751c9ea37138ee0f09c6a3a5c2 100644 (file)
--- a/include/linux/wifi_tiwlan.h
+++ b/include/linux/wifi_tiwlan.h
@@ -15,8 +15,6 @@
 #ifndef _LINUX_WIFI_TIWLAN_H_
 #define _LINUX_WIFI_TIWLAN_H_
 
-#include <linux/wlan_plat.h>
-
 #define WMPA_NUMBER_OF_SECTIONS        3
 #define WMPA_NUMBER_OF_BUFFERS 160
 #define WMPA_SECTION_HEADER    24
@@ -24,4 +22,11 @@
 #define WMPA_SECTION_SIZE_1    (WMPA_NUMBER_OF_BUFFERS * 256)
 #define WMPA_SECTION_SIZE_2    (WMPA_NUMBER_OF_BUFFERS * 2048)
 
+struct wifi_platform_data {
+        int (*set_power)(int val);
+        int (*set_reset)(int val);
+        int (*set_carddetect)(int val);
+       void *(*mem_prealloc)(int section, unsigned long size);
+};
+
 #endif

diff --git a/include/linux/wlan_plat.h b/include/linux/wlan_plat.h
deleted file mode 100644 (file)
index 70ee63b..0000000
--- a/include/linux/wlan_plat.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/* include/linux/wlan_plat.h
- *
- * Copyright (C) 2010 Google, Inc.
- *
- * This software is licensed under the terms of the GNU General Public
- * License version 2, as published by the Free Software Foundation, and
- * may be copied, distributed, and modified under those terms.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- */
-#ifndef _LINUX_WLAN_PLAT_H_
-#define _LINUX_WLAN_PLAT_H_
-
-struct wifi_platform_data {
-       int (*set_power)(int val);
-       int (*set_reset)(int val);
-       int (*set_carddetect)(int val);
-       void *(*mem_prealloc)(int section, unsigned long size);
-};
-
-#endif