Fix loading of upnp module.

Also, remove leftover _intel parts here and there.

modules/services_discovery/upnp.cpp

 /*****************************************************************************
- * Upnp_intel.cpp :  UPnP discovery module (libupnp)
+ * Upnp.cpp :  UPnP discovery module (libupnp)
  *****************************************************************************
  * Copyright (C) 2004-2008 the VideoLAN team
  * $Id$
@@ -55,7 +55,7 @@ struct services_discovery_sys_t
 // VLC callback prototypes
 static int Open( vlc_object_t* );
 static void Close( vlc_object_t* );
-VLC_SD_PROBE_HELPER("upnp_intel", "Universal Plug'n'Play", SD_CAT_LAN)
+VLC_SD_PROBE_HELPER("upnp", "Universal Plug'n'Play", SD_CAT_LAN)
 
 // Module descriptor
 

projects/macosx/framework/Sources/VLCMediaDiscoverer.m

@@ -75,7 +75,7 @@ static void HandleMediaDiscovererEnded( const libvlc_event_t * event, void * use
     {
         availableMediaDiscoverer = [[NSArray arrayWithObjects:
                                 [[[VLCMediaDiscoverer alloc] initWithName:@"sap"] autorelease],
-                                [[[VLCMediaDiscoverer alloc] initWithName:@"upnp_intel"] autorelease],
+                                [[[VLCMediaDiscoverer alloc] initWithName:@"upnp"] autorelease],
                                 [[[VLCMediaDiscoverer alloc] initWithName:@"freebox"] autorelease],
                                 [[[VLCMediaDiscoverer alloc] initWithName:@"video_dir"] autorelease], nil] retain];
     }