Import 2.3.34

diff --git a/arch/i386/defconfig b/arch/i386/defconfig
index 6d4079af311dedb1c44dee887b4fa250df7dd479..982fbdb8871fcbe752c3e25b0b39988e32f77614 100644 (file)
--- a/arch/i386/defconfig
+++ b/arch/i386/defconfig
@@ -105,7 +105,6 @@ CONFIG_BLK_DEV_IDEPCI=y
 # CONFIG_BLK_DEV_IDEDMA_PCI is not set
 # CONFIG_BLK_DEV_OFFBOARD is not set
 # CONFIG_BLK_DEV_AEC6210 is not set
-CONFIG_BLK_DEV_PIIX=y
 # CONFIG_IDE_CHIPSETS is not set
 # CONFIG_BLK_CPQ_DA is not set
 
@@ -310,6 +309,7 @@ CONFIG_PCMCIA_PCNET=y
 # CONFIG_PCMCIA_3C575 is not set
 # CONFIG_PCMCIA_TULIP is not set
 # CONFIG_PCMCIA_EPIC100 is not set
+CONFIG_NET_PCMCIA_RADIO=y
 CONFIG_PCMCIA_RAYCS=y
 # CONFIG_PCMCIA_NETWAVE is not set
 # CONFIG_PCMCIA_WAVELAN is not set
@@ -397,7 +397,7 @@ CONFIG_DRM_TDFX=y
 # CONFIG_PCMCIA_SERIAL_CB is not set
 
 #
-# Support for USB
+# USB support
 #
 # CONFIG_USB is not set
 

diff --git a/drivers/pcmcia/cs.c b/drivers/pcmcia/cs.c
index da43623c43d68de15381b48dbdd267757c4ff4c8..575aadbc8f8173d016ccd2f8187f548f5e039c5e 100644 (file)
--- a/drivers/pcmcia/cs.c
+++ b/drivers/pcmcia/cs.c
@@ -2229,6 +2229,55 @@ int CardServices(int func, void *a1, void *a2, void *a3)
     OS-specific module glue goes here
     
 ======================================================================*/
+EXPORT_SYMBOL(pcmcia_access_configuration_register);
+EXPORT_SYMBOL(pcmcia_adjust_resource_info);
+EXPORT_SYMBOL(pcmcia_check_erase_queue);
+EXPORT_SYMBOL(pcmcia_close_memory);
+EXPORT_SYMBOL(pcmcia_copy_memory);
+EXPORT_SYMBOL(pcmcia_deregister_client);
+EXPORT_SYMBOL(pcmcia_deregister_erase_queue);
+EXPORT_SYMBOL(pcmcia_get_first_client);
+EXPORT_SYMBOL(pcmcia_get_card_services_info);
+EXPORT_SYMBOL(pcmcia_get_configuration_info);
+EXPORT_SYMBOL(pcmcia_get_next_client);
+EXPORT_SYMBOL(pcmcia_get_first_region);
+EXPORT_SYMBOL(pcmcia_get_first_tuple);
+EXPORT_SYMBOL(pcmcia_get_next_region);
+EXPORT_SYMBOL(pcmcia_get_next_tuple);
+EXPORT_SYMBOL(pcmcia_get_status);
+EXPORT_SYMBOL(pcmcia_get_tuple_data);
+EXPORT_SYMBOL(pcmcia_map_mem_page);
+EXPORT_SYMBOL(pcmcia_modify_configuration);
+EXPORT_SYMBOL(pcmcia_modify_window);
+EXPORT_SYMBOL(pcmcia_open_memory);
+EXPORT_SYMBOL(pcmcia_parse_tuple);
+EXPORT_SYMBOL(pcmcia_read_memory);
+EXPORT_SYMBOL(pcmcia_register_client);
+EXPORT_SYMBOL(pcmcia_register_erase_queue);
+EXPORT_SYMBOL(pcmcia_register_mtd);
+EXPORT_SYMBOL(pcmcia_release_configuration);
+EXPORT_SYMBOL(pcmcia_release_io);
+EXPORT_SYMBOL(pcmcia_release_irq);
+EXPORT_SYMBOL(pcmcia_release_window);
+EXPORT_SYMBOL(pcmcia_request_configuration);
+EXPORT_SYMBOL(pcmcia_request_io);
+EXPORT_SYMBOL(pcmcia_request_irq);
+EXPORT_SYMBOL(pcmcia_request_window);
+EXPORT_SYMBOL(pcmcia_reset_card);
+EXPORT_SYMBOL(pcmcia_set_event_mask);
+EXPORT_SYMBOL(pcmcia_validate_cis);
+EXPORT_SYMBOL(pcmcia_write_memory);
+EXPORT_SYMBOL(pcmcia_bind_device);
+EXPORT_SYMBOL(pcmcia_bind_mtd);
+EXPORT_SYMBOL(pcmcia_report_error);
+EXPORT_SYMBOL(pcmcia_suspend_card);
+EXPORT_SYMBOL(pcmcia_resume_card);
+EXPORT_SYMBOL(pcmcia_eject_card);
+EXPORT_SYMBOL(pcmcia_insert_card);
+EXPORT_SYMBOL(pcmcia_replace_cis);
+EXPORT_SYMBOL(pcmcia_get_first_window);
+EXPORT_SYMBOL(pcmcia_get_next_window);
+EXPORT_SYMBOL(pcmcia_get_mem_page);
 
 EXPORT_SYMBOL(register_ss_entry);
 EXPORT_SYMBOL(unregister_ss_entry);

diff --git a/fs/ext2/balloc.c b/fs/ext2/balloc.c
index 6c232ce793f2c6fc3ff868f20cf596c58c4e5e27..43a425bbb148d193f9250efc4bae33110b38b574 100644 (file)
--- a/fs/ext2/balloc.c
+++ b/fs/ext2/balloc.c
@@ -118,8 +118,8 @@ error_out:
  * 
  * Return the slot used to store the bitmap, or a -ve error code.
  */
-static int load__block_bitmap (struct super_block * sb,
-                              unsigned int block_group)
+static int __load_block_bitmap (struct super_block * sb,
+                               unsigned int block_group)
 {
        int i, j, retval = 0;
        unsigned long block_bitmap_number;
@@ -136,7 +136,7 @@ static int load__block_bitmap (struct super_block * sb,
                        if (sb->u.ext2_sb.s_block_bitmap_number[block_group] ==
                            block_group)
                                return block_group;
-                       ext2_error (sb, "load_block_bitmap",
+                       ext2_error (sb, "__load_block_bitmap",
                                    "block_group != block_bitmap_number");
                }
                retval = read_block_bitmap (sb, block_group, block_group);
@@ -192,7 +192,7 @@ static int load__block_bitmap (struct super_block * sb,
  * Return the slot number of the group in the superblock bitmap cache's on
  * success, or a -ve error code.
  *
- * There is still one inconsistancy here --- if the number of groups in this
+ * There is still one inconsistency here --- if the number of groups in this
  * filesystems is <= EXT2_MAX_GROUP_LOADED, then we have no way of 
  * differentiating between a group for which we have never performed a bitmap
  * IO request, and a group for which the last bitmap read request failed.
@@ -224,7 +224,7 @@ static inline int load_block_bitmap (struct super_block * sb,
         * If not, then do a full lookup for this block group.
         */
        else {
-               slot = load__block_bitmap (sb, block_group);
+               slot = __load_block_bitmap (sb, block_group);
        }
 
        /*

diff --git a/fs/udf/balloc.c b/fs/udf/balloc.c
index 03e66fe236a4a7c267e7cb829bf148e662c2d272..41274039de3a4fd84f1cf2efdec94004bff15f82 100644 (file)
--- a/fs/udf/balloc.c
+++ b/fs/udf/balloc.c
@@ -104,7 +104,7 @@ static int read_block_bitmap(struct super_block * sb, unsigned int block,
        return retval;
 }
 
-static int load__block_bitmap(struct super_block * sb, unsigned int block_group)
+static int __load_block_bitmap(struct super_block * sb, unsigned int block_group)
 {
        int i, j, retval = 0;
        unsigned long block_bitmap_number;
@@ -188,7 +188,7 @@ static inline int load_block_bitmap(struct super_block *sb,
        }
        else
        {
-               slot = load__block_bitmap(sb, block_group);
+               slot = __load_block_bitmap(sb, block_group);
        }
 
        if (slot < 0)