diff options
author | Tony Breeds <tony@bakeyournoodle.com> | 2008-04-24 03:02:04 -0400 |
---|---|---|
committer | Stefan Richter <stefanr@s5r6.in-berlin.de> | 2008-04-25 12:15:45 -0400 |
commit | e38649702ea64fdbbab3dd459bf8558142dd3bc4 (patch) | |
tree | ce344a4a2744db7c84a7dbfa10df00f09dd3affc /drivers/ieee1394 | |
parent | cc9429bcb6e36e9f2c51e4e47b95740e472c4c2d (diff) |
ieee1394: silence defined but not used warning in non-modular builds
Currently the kernel will issue the following warning:
drivers/ieee1394/raw1394.c:2938: warning: 'raw1394_id_table' defined but not used
Add #ifdef MODULE guards around the declaration.
Signed-off-by: Tony Breeds <tony@bakeyournoodle.com>
Ditto with dv1394_id_table and video1394_id_table.
Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
Diffstat (limited to 'drivers/ieee1394')
-rw-r--r-- | drivers/ieee1394/dv1394.c | 2 | ||||
-rw-r--r-- | drivers/ieee1394/raw1394.c | 2 | ||||
-rw-r--r-- | drivers/ieee1394/video1394.c | 2 |
3 files changed, 6 insertions, 0 deletions
diff --git a/drivers/ieee1394/dv1394.c b/drivers/ieee1394/dv1394.c index 6228fadacd38..9d19aec5820a 100644 --- a/drivers/ieee1394/dv1394.c +++ b/drivers/ieee1394/dv1394.c | |||
@@ -2167,6 +2167,7 @@ static const struct file_operations dv1394_fops= | |||
2167 | /* | 2167 | /* |
2168 | * Export information about protocols/devices supported by this driver. | 2168 | * Export information about protocols/devices supported by this driver. |
2169 | */ | 2169 | */ |
2170 | #ifdef MODULE | ||
2170 | static struct ieee1394_device_id dv1394_id_table[] = { | 2171 | static struct ieee1394_device_id dv1394_id_table[] = { |
2171 | { | 2172 | { |
2172 | .match_flags = IEEE1394_MATCH_SPECIFIER_ID | IEEE1394_MATCH_VERSION, | 2173 | .match_flags = IEEE1394_MATCH_SPECIFIER_ID | IEEE1394_MATCH_VERSION, |
@@ -2177,6 +2178,7 @@ static struct ieee1394_device_id dv1394_id_table[] = { | |||
2177 | }; | 2178 | }; |
2178 | 2179 | ||
2179 | MODULE_DEVICE_TABLE(ieee1394, dv1394_id_table); | 2180 | MODULE_DEVICE_TABLE(ieee1394, dv1394_id_table); |
2181 | #endif /* MODULE */ | ||
2180 | 2182 | ||
2181 | static struct hpsb_protocol_driver dv1394_driver = { | 2183 | static struct hpsb_protocol_driver dv1394_driver = { |
2182 | .name = "dv1394", | 2184 | .name = "dv1394", |
diff --git a/drivers/ieee1394/raw1394.c b/drivers/ieee1394/raw1394.c index 567dafc2369d..ec2a0adbedb2 100644 --- a/drivers/ieee1394/raw1394.c +++ b/drivers/ieee1394/raw1394.c | |||
@@ -2940,6 +2940,7 @@ static int raw1394_release(struct inode *inode, struct file *file) | |||
2940 | /* | 2940 | /* |
2941 | * Export information about protocols/devices supported by this driver. | 2941 | * Export information about protocols/devices supported by this driver. |
2942 | */ | 2942 | */ |
2943 | #ifdef MODULE | ||
2943 | static struct ieee1394_device_id raw1394_id_table[] = { | 2944 | static struct ieee1394_device_id raw1394_id_table[] = { |
2944 | { | 2945 | { |
2945 | .match_flags = IEEE1394_MATCH_SPECIFIER_ID | IEEE1394_MATCH_VERSION, | 2946 | .match_flags = IEEE1394_MATCH_SPECIFIER_ID | IEEE1394_MATCH_VERSION, |
@@ -2961,6 +2962,7 @@ static struct ieee1394_device_id raw1394_id_table[] = { | |||
2961 | }; | 2962 | }; |
2962 | 2963 | ||
2963 | MODULE_DEVICE_TABLE(ieee1394, raw1394_id_table); | 2964 | MODULE_DEVICE_TABLE(ieee1394, raw1394_id_table); |
2965 | #endif /* MODULE */ | ||
2964 | 2966 | ||
2965 | static struct hpsb_protocol_driver raw1394_driver = { | 2967 | static struct hpsb_protocol_driver raw1394_driver = { |
2966 | .name = "raw1394", | 2968 | .name = "raw1394", |
diff --git a/drivers/ieee1394/video1394.c b/drivers/ieee1394/video1394.c index e03024eeeac1..e24772d336e1 100644 --- a/drivers/ieee1394/video1394.c +++ b/drivers/ieee1394/video1394.c | |||
@@ -1293,6 +1293,7 @@ static const struct file_operations video1394_fops= | |||
1293 | /* | 1293 | /* |
1294 | * Export information about protocols/devices supported by this driver. | 1294 | * Export information about protocols/devices supported by this driver. |
1295 | */ | 1295 | */ |
1296 | #ifdef MODULE | ||
1296 | static struct ieee1394_device_id video1394_id_table[] = { | 1297 | static struct ieee1394_device_id video1394_id_table[] = { |
1297 | { | 1298 | { |
1298 | .match_flags = IEEE1394_MATCH_SPECIFIER_ID | IEEE1394_MATCH_VERSION, | 1299 | .match_flags = IEEE1394_MATCH_SPECIFIER_ID | IEEE1394_MATCH_VERSION, |
@@ -1313,6 +1314,7 @@ static struct ieee1394_device_id video1394_id_table[] = { | |||
1313 | }; | 1314 | }; |
1314 | 1315 | ||
1315 | MODULE_DEVICE_TABLE(ieee1394, video1394_id_table); | 1316 | MODULE_DEVICE_TABLE(ieee1394, video1394_id_table); |
1317 | #endif /* MODULE */ | ||
1316 | 1318 | ||
1317 | static struct hpsb_protocol_driver video1394_driver = { | 1319 | static struct hpsb_protocol_driver video1394_driver = { |
1318 | .name = VIDEO1394_DRIVER_NAME, | 1320 | .name = VIDEO1394_DRIVER_NAME, |