Merge branch 'for-2010.11/remove-deprecated-packages' of git://git.busybox.net/~tpetazzoni/git/buildroot

28 files changed, 0 insertions, 48 deletions

diff --git a/configs/arm_nptl_toolchain_defconfig b/configs/arm_nptl_toolchain_defconfig
index 02e684413..d7b26a5b0 100644
--- a/configs/arm_nptl_toolchain_defconfig
+++ b/configs/arm_nptl_toolchain_defconfig
@@ -568,7 +568,6 @@ BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y
 # BR2_PACKAGE_LIBDAEMON is not set
 # BR2_PACKAGE_LIBELF is not set
 # BR2_PACKAGE_LIBEVENT is not set
-# BR2_PACKAGE_LIBGLIB12 is not set
 # BR2_PACKAGE_LIBGLIB2 is not set
 # BR2_PACKAGE_LIBOIL is not set
 
diff --git a/configs/arm_toolchain_defconfig b/configs/arm_toolchain_defconfig
index bd6f3e281..08f548589 100644
--- a/configs/arm_toolchain_defconfig
+++ b/configs/arm_toolchain_defconfig
@@ -615,7 +615,6 @@ BR2_PACKAGE_XSERVER_none=y
 # BR2_PACKAGE_PANGO is not set
 # BR2_PACKAGE_LIBDRM is not set
 # BR2_PACKAGE_LIBERATION is not set
-# BR2_PACKAGE_LIBGLIB12 is not set
 # BR2_PACKAGE_LIBGLIB2 is not set
 # BR2_PACKAGE_OPENMOTIF is not set
 # BR2_PACKAGE_FONTCONFIG is not set
diff --git a/configs/at91rm9200df_defconfig b/configs/at91rm9200df_defconfig
index 727a6ea3d..f589eeb2b 100644
--- a/configs/at91rm9200df_defconfig
+++ b/configs/at91rm9200df_defconfig
@@ -623,7 +623,6 @@ BR2_PACKAGE_MTD_NFTLDUMP=y
 BR2_PACKAGE_MTD_SUMTOOL=y
 # BR2_PACKAGE_NTFS-3G is not set
 # BR2_PACKAGE_PCIUTILS is not set
-# BR2_PACKAGE_PCMCIA is not set
 BR2_PACKAGE_SETSERIAL=y
 # BR2_PACKAGE_SMARTMONTOOLS is not set
 BR2_PACKAGE_UDEV_VOLUME_ID=y
@@ -722,7 +721,6 @@ BR2_PACKAGE_XSERVER_none=y
 # BR2_PACKAGE_PANGO is not set
 # BR2_PACKAGE_LIBDRM is not set
 # BR2_PACKAGE_LIBERATION is not set
-# BR2_PACKAGE_LIBGLIB12 is not set
 BR2_PACKAGE_LIBGLIB2=y
 # BR2_PACKAGE_OPENMOTIF is not set
 # BR2_PACKAGE_FONTCONFIG is not set
diff --git a/configs/at91rm9200df_ext_bare_defconfig b/configs/at91rm9200df_ext_bare_defconfig
index fec2c04ab..651ac37d6 100644
--- a/configs/at91rm9200df_ext_bare_defconfig
+++ b/configs/at91rm9200df_ext_bare_defconfig
@@ -539,7 +539,6 @@ BR2_PACKAGE_XSERVER_none=y
 # BR2_PACKAGE_PANGO is not set
 # BR2_PACKAGE_LIBDRM is not set
 # BR2_PACKAGE_LIBERATION is not set
-# BR2_PACKAGE_LIBGLIB12 is not set
 # BR2_PACKAGE_LIBGLIB2 is not set
 # BR2_PACKAGE_OPENMOTIF is not set
 # BR2_PACKAGE_FONTCONFIG is not set
diff --git a/configs/at91rm9200df_ext_defconfig b/configs/at91rm9200df_ext_defconfig
index c73e37273..d261fb817 100644
--- a/configs/at91rm9200df_ext_defconfig
+++ b/configs/at91rm9200df_ext_defconfig
@@ -552,7 +552,6 @@ BR2_PACKAGE_MTD_NFTLDUMP=y
 BR2_PACKAGE_MTD_SUMTOOL=y
 # BR2_PACKAGE_NTFS-3G is not set
 # BR2_PACKAGE_PCIUTILS is not set
-# BR2_PACKAGE_PCMCIA is not set
 BR2_PACKAGE_SETSERIAL=y
 # BR2_PACKAGE_SMARTMONTOOLS is not set
 BR2_PACKAGE_UDEV_VOLUME_ID=y
@@ -651,7 +650,6 @@ BR2_PACKAGE_XSERVER_none=y
 # BR2_PACKAGE_PANGO is not set
 # BR2_PACKAGE_LIBDRM is not set
 # BR2_PACKAGE_LIBERATION is not set
-# BR2_PACKAGE_LIBGLIB12 is not set
 BR2_PACKAGE_LIBGLIB2=y
 # BR2_PACKAGE_OPENMOTIF is not set
 # BR2_PACKAGE_FONTCONFIG is not set
diff --git a/configs/at91sam9260dfc_defconfig b/configs/at91sam9260dfc_defconfig
index de002c4be..8aeff0faf 100644
--- a/configs/at91sam9260dfc_defconfig
+++ b/configs/at91sam9260dfc_defconfig
@@ -637,7 +637,6 @@ BR2_PACKAGE_MTD_NFTLDUMP=y
 BR2_PACKAGE_MTD_SUMTOOL=y
 # BR2_PACKAGE_NTFS-3G is not set
 # BR2_PACKAGE_PCIUTILS is not set
-# BR2_PACKAGE_PCMCIA is not set
 BR2_PACKAGE_SETSERIAL=y
 # BR2_PACKAGE_SMARTMONTOOLS is not set
 BR2_PACKAGE_UDEV_VOLUME_ID=y
@@ -736,7 +735,6 @@ BR2_PACKAGE_XSERVER_none=y
 # BR2_PACKAGE_PANGO is not set
 # BR2_PACKAGE_LIBDRM is not set
 # BR2_PACKAGE_LIBERATION is not set
-# BR2_PACKAGE_LIBGLIB12 is not set
 BR2_PACKAGE_LIBGLIB2=y
 # BR2_PACKAGE_OPENMOTIF is not set
 # BR2_PACKAGE_FONTCONFIG is not set
diff --git a/configs/at91sam9260dfc_ext_bare_defconfig b/configs/at91sam9260dfc_ext_bare_defconfig
index 540eef666..9527522aa 100644
--- a/configs/at91sam9260dfc_ext_bare_defconfig
+++ b/configs/at91sam9260dfc_ext_bare_defconfig
@@ -539,7 +539,6 @@ BR2_PACKAGE_XSERVER_none=y
 # BR2_PACKAGE_PANGO is not set
 # BR2_PACKAGE_LIBDRM is not set
 # BR2_PACKAGE_LIBERATION is not set
-# BR2_PACKAGE_LIBGLIB12 is not set
 # BR2_PACKAGE_LIBGLIB2 is not set
 # BR2_PACKAGE_OPENMOTIF is not set
 # BR2_PACKAGE_FONTCONFIG is not set
diff --git a/configs/at91sam9260dfc_ext_defconfig b/configs/at91sam9260dfc_ext_defconfig
index 91cdeddab..e9ad28b40 100644
--- a/configs/at91sam9260dfc_ext_defconfig
+++ b/configs/at91sam9260dfc_ext_defconfig
@@ -560,7 +560,6 @@ BR2_PACKAGE_MTD_NFTLDUMP=y
 BR2_PACKAGE_MTD_SUMTOOL=y
 # BR2_PACKAGE_NTFS-3G is not set
 # BR2_PACKAGE_PCIUTILS is not set
-# BR2_PACKAGE_PCMCIA is not set
 BR2_PACKAGE_SETSERIAL=y
 # BR2_PACKAGE_SMARTMONTOOLS is not set
 BR2_PACKAGE_UDEV_VOLUME_ID=y
@@ -659,7 +658,6 @@ BR2_PACKAGE_XSERVER_none=y
 # BR2_PACKAGE_PANGO is not set
 # BR2_PACKAGE_LIBDRM is not set
 # BR2_PACKAGE_LIBERATION is not set
-# BR2_PACKAGE_LIBGLIB12 is not set
 BR2_PACKAGE_LIBGLIB2=y
 # BR2_PACKAGE_OPENMOTIF is not set
 # BR2_PACKAGE_FONTCONFIG is not set
diff --git a/configs/at91sam9260pf_defconfig b/configs/at91sam9260pf_defconfig
index ab2913381..a2a7fef4d 100644
--- a/configs/at91sam9260pf_defconfig
+++ b/configs/at91sam9260pf_defconfig
@@ -423,7 +423,6 @@ BR2_BLOCKDEV_SUPPORT=y
 # BR2_PACKAGE_MKDOSFS is not set
 # BR2_PACKAGE_MTD is not set
 # BR2_PACKAGE_PCIUTILS is not set
-# BR2_PACKAGE_PCMCIA is not set
 # BR2_PACKAGE_RAIDTOOLS is not set
 # BR2_PACKAGE_SETSERIAL is not set
 # BR2_PACKAGE_SFDISK is not set
@@ -502,7 +501,6 @@ BR2_PACKAGE_XSERVER_none=y
 # BR2_PACKAGE_ATK is not set
 # BR2_PACKAGE_PANGO is not set
 # BR2_PACKAGE_LIBDRM is not set
-# BR2_PACKAGE_LIBGLIB12 is not set
 # BR2_PACKAGE_LIBGLIB2 is not set
 BR2_PACKAGE_FONTCONFIG=y
 BR2_PACKAGE_FREETYPE=y
diff --git a/configs/at91sam9261ek_defconfig b/configs/at91sam9261ek_defconfig
index 0a1fc5112..5d45cd404 100644
--- a/configs/at91sam9261ek_defconfig
+++ b/configs/at91sam9261ek_defconfig
@@ -580,7 +580,6 @@ BR2_PACKAGE_MTD_NFTLDUMP=y
 BR2_PACKAGE_MTD_SUMTOOL=y
 # BR2_PACKAGE_NTFS-3G is not set
 # BR2_PACKAGE_PCIUTILS is not set
-# BR2_PACKAGE_PCMCIA is not set
 BR2_PACKAGE_SETSERIAL=y
 # BR2_PACKAGE_SMARTMONTOOLS is not set
 BR2_PACKAGE_UDEV_VOLUME_ID=y
@@ -738,7 +737,6 @@ BR2_PACKAGE_PANGO=y
 # BR2_PACKAGE_LIBDRM is not set
 BR2_PACKAGE_LIBERATION=y
 # BR2_PACKAGE_LIBGLADE is not set
-BR2_PACKAGE_LIBGLIB12=y
 BR2_PACKAGE_LIBGLIB2=y
 BR2_PACKAGE_LIBGTK2=y
 BR2_PACKAGE_LIBGTK2_ENGINES=y
diff --git a/configs/at91sam9261ek_ext_bare_defconfig b/configs/at91sam9261ek_ext_bare_defconfig
index ab8851f9c..99b124d2a 100644
--- a/configs/at91sam9261ek_ext_bare_defconfig
+++ b/configs/at91sam9261ek_ext_bare_defconfig
@@ -542,7 +542,6 @@ BR2_PACKAGE_XSERVER_none=y
 # BR2_PACKAGE_PANGO is not set
 # BR2_PACKAGE_LIBDRM is not set
 # BR2_PACKAGE_LIBERATION is not set
-# BR2_PACKAGE_LIBGLIB12 is not set
 # BR2_PACKAGE_LIBGLIB2 is not set
 # BR2_PACKAGE_OPENMOTIF is not set
 # BR2_PACKAGE_FONTCONFIG is not set
diff --git a/configs/at91sam9261ek_ext_defconfig b/configs/at91sam9261ek_ext_defconfig
index 6ebe9fd8f..45c8744c2 100644
--- a/configs/at91sam9261ek_ext_defconfig
+++ b/configs/at91sam9261ek_ext_defconfig
@@ -539,7 +539,6 @@ BR2_PACKAGE_MTD_NFTLDUMP=y
 BR2_PACKAGE_MTD_SUMTOOL=y
 # BR2_PACKAGE_NTFS-3G is not set
 # BR2_PACKAGE_PCIUTILS is not set
-# BR2_PACKAGE_PCMCIA is not set
 BR2_PACKAGE_SETSERIAL=y
 # BR2_PACKAGE_SMARTMONTOOLS is not set
 BR2_PACKAGE_UDEV_VOLUME_ID=y
@@ -697,7 +696,6 @@ BR2_PACKAGE_PANGO=y
 # BR2_PACKAGE_LIBDRM is not set
 BR2_PACKAGE_LIBERATION=y
 # BR2_PACKAGE_LIBGLADE is not set
-BR2_PACKAGE_LIBGLIB12=y
 BR2_PACKAGE_LIBGLIB2=y
 BR2_PACKAGE_LIBGTK2=y
 BR2_PACKAGE_LIBGTK2_ENGINES=y
diff --git a/configs/at91sam9263ek_defconfig b/configs/at91sam9263ek_defconfig
index d29310818..e4200e1f7 100644
--- a/configs/at91sam9263ek_defconfig
+++ b/configs/at91sam9263ek_defconfig
@@ -577,7 +577,6 @@ BR2_PACKAGE_MTD_NFTLDUMP=y
 BR2_PACKAGE_MTD_SUMTOOL=y
 # BR2_PACKAGE_NTFS-3G is not set
 # BR2_PACKAGE_PCIUTILS is not set
-# BR2_PACKAGE_PCMCIA is not set
 BR2_PACKAGE_SETSERIAL=y
 # BR2_PACKAGE_SMARTMONTOOLS is not set
 BR2_PACKAGE_UDEV_VOLUME_ID=y
@@ -735,7 +734,6 @@ BR2_PACKAGE_PANGO=y
 # BR2_PACKAGE_LIBDRM is not set
 BR2_PACKAGE_LIBERATION=y
 # BR2_PACKAGE_LIBGLADE is not set
-BR2_PACKAGE_LIBGLIB12=y
 BR2_PACKAGE_LIBGLIB2=y
 BR2_PACKAGE_LIBGTK2=y
 BR2_PACKAGE_LIBGTK2_ENGINES=y
diff --git a/configs/at91sam9263ek_ext_bare_defconfig b/configs/at91sam9263ek_ext_bare_defconfig
index 2578b9509..b9712b584 100644
--- a/configs/at91sam9263ek_ext_bare_defconfig
+++ b/configs/at91sam9263ek_ext_bare_defconfig
@@ -541,7 +541,6 @@ BR2_PACKAGE_XSERVER_none=y
 # BR2_PACKAGE_PANGO is not set
 # BR2_PACKAGE_LIBDRM is not set
 # BR2_PACKAGE_LIBERATION is not set
-# BR2_PACKAGE_LIBGLIB12 is not set
 # BR2_PACKAGE_LIBGLIB2 is not set
 # BR2_PACKAGE_OPENMOTIF is not set
 # BR2_PACKAGE_FONTCONFIG is not set
diff --git a/configs/at91sam9263ek_ext_defconfig b/configs/at91sam9263ek_ext_defconfig
index 843b0fb0d..5c499e970 100644
--- a/configs/at91sam9263ek_ext_defconfig
+++ b/configs/at91sam9263ek_ext_defconfig
@@ -502,7 +502,6 @@ BR2_PACKAGE_MTD_NFTLDUMP=y
 BR2_PACKAGE_MTD_SUMTOOL=y
 # BR2_PACKAGE_NTFS-3G is not set
 # BR2_PACKAGE_PCIUTILS is not set
-# BR2_PACKAGE_PCMCIA is not set
 BR2_PACKAGE_SETSERIAL=y
 # BR2_PACKAGE_SMARTMONTOOLS is not set
 BR2_PACKAGE_UDEV_VOLUME_ID=y
@@ -660,7 +659,6 @@ BR2_PACKAGE_PANGO=y
 # BR2_PACKAGE_LIBDRM is not set
 BR2_PACKAGE_LIBERATION=y
 # BR2_PACKAGE_LIBGLADE is not set
-BR2_PACKAGE_LIBGLIB12=y
 BR2_PACKAGE_LIBGLIB2=y
 BR2_PACKAGE_LIBGTK2=y
 BR2_PACKAGE_LIBGTK2_ENGINES=y
diff --git a/configs/at91sam9g20dfc_defconfig b/configs/at91sam9g20dfc_defconfig
index a9347a8a6..bd465572c 100644
--- a/configs/at91sam9g20dfc_defconfig
+++ b/configs/at91sam9g20dfc_defconfig
@@ -573,7 +573,6 @@ BR2_PACKAGE_MTD_NFTLDUMP=y
 BR2_PACKAGE_MTD_SUMTOOL=y
 # BR2_PACKAGE_NTFS-3G is not set
 # BR2_PACKAGE_PCIUTILS is not set
-# BR2_PACKAGE_PCMCIA is not set
 BR2_PACKAGE_SETSERIAL=y
 # BR2_PACKAGE_SMARTMONTOOLS is not set
 BR2_PACKAGE_UDEV_VOLUME_ID=y
@@ -670,7 +669,6 @@ BR2_PACKAGE_XSERVER_none=y
 # BR2_PACKAGE_PANGO is not set
 # BR2_PACKAGE_LIBDRM is not set
 # BR2_PACKAGE_LIBERATION is not set
-# BR2_PACKAGE_LIBGLIB12 is not set
 # BR2_PACKAGE_LIBGLIB2 is not set
 # BR2_PACKAGE_OPENMOTIF is not set
 # BR2_PACKAGE_FONTCONFIG is not set
diff --git a/configs/at91sam9g20dfc_ext_bare_defconfig b/configs/at91sam9g20dfc_ext_bare_defconfig
index 49a5124cb..a48822a54 100644
--- a/configs/at91sam9g20dfc_ext_bare_defconfig
+++ b/configs/at91sam9g20dfc_ext_bare_defconfig
@@ -539,7 +539,6 @@ BR2_PACKAGE_XSERVER_none=y
 # BR2_PACKAGE_PANGO is not set
 # BR2_PACKAGE_LIBDRM is not set
 # BR2_PACKAGE_LIBERATION is not set
-# BR2_PACKAGE_LIBGLIB12 is not set
 # BR2_PACKAGE_LIBGLIB2 is not set
 # BR2_PACKAGE_OPENMOTIF is not set
 # BR2_PACKAGE_FONTCONFIG is not set
diff --git a/configs/at91sam9g20dfc_ext_defconfig b/configs/at91sam9g20dfc_ext_defconfig
index bd967235f..f233890da 100644
--- a/configs/at91sam9g20dfc_ext_defconfig
+++ b/configs/at91sam9g20dfc_ext_defconfig
@@ -560,7 +560,6 @@ BR2_PACKAGE_MTD_NFTLDUMP=y
 BR2_PACKAGE_MTD_SUMTOOL=y
 # BR2_PACKAGE_NTFS-3G is not set
 # BR2_PACKAGE_PCIUTILS is not set
-# BR2_PACKAGE_PCMCIA is not set
 BR2_PACKAGE_SETSERIAL=y
 # BR2_PACKAGE_SMARTMONTOOLS is not set
 BR2_PACKAGE_UDEV_VOLUME_ID=y
@@ -659,7 +658,6 @@ BR2_PACKAGE_XSERVER_none=y
 # BR2_PACKAGE_PANGO is not set
 # BR2_PACKAGE_LIBDRM is not set
 # BR2_PACKAGE_LIBERATION is not set
-# BR2_PACKAGE_LIBGLIB12 is not set
 BR2_PACKAGE_LIBGLIB2=y
 # BR2_PACKAGE_OPENMOTIF is not set
 # BR2_PACKAGE_FONTCONFIG is not set
diff --git a/configs/atngw100-base_defconfig b/configs/atngw100-base_defconfig
index 116f671f9..b49852442 100644
--- a/configs/atngw100-base_defconfig
+++ b/configs/atngw100-base_defconfig
@@ -486,7 +486,6 @@ BR2_PACKAGE_MTD_NANDWRITE=y
 BR2_PACKAGE_MTD_SUMTOOL=y
 # BR2_PACKAGE_NTFS_3G is not set
 # BR2_PACKAGE_PCIUTILS is not set
-# BR2_PACKAGE_PCMCIA is not set
 # BR2_PACKAGE_SETSERIAL is not set
 # BR2_PACKAGE_SMARTMONTOOLS is not set
 # BR2_PACKAGE_USBMOUNT is not set
@@ -587,7 +586,6 @@ BR2_PACKAGE_XSERVER_none=y
 # BR2_PACKAGE_PANGO is not set
 # BR2_PACKAGE_LIBDRM is not set
 # BR2_PACKAGE_LIBERATION is not set
-# BR2_PACKAGE_LIBGLIB12 is not set
 # BR2_PACKAGE_LIBGLIB2 is not set
 # BR2_PACKAGE_OPENMOTIF is not set
 # BR2_PACKAGE_FONTCONFIG is not set
diff --git a/configs/atngw100_defconfig b/configs/atngw100_defconfig
index 50c376b31..619cae67f 100644
--- a/configs/atngw100_defconfig
+++ b/configs/atngw100_defconfig
@@ -428,7 +428,6 @@ BR2_PACKAGE_MTD_UBIUPDATEVOL=y
 # BR2_PACKAGE_NTFS_3G is not set
 # BR2_PACKAGE_NTFSPROGS is not set
 # BR2_PACKAGE_PCIUTILS is not set
-# BR2_PACKAGE_PCMCIA is not set
 # BR2_PACKAGE_SETSERIAL is not set
 # BR2_PACKAGE_SMARTMONTOOLS is not set
 # BR2_PACKAGE_SQUASHFS is not set
@@ -545,7 +544,6 @@ BR2_PACKAGE_ZLIB=y
 BR2_PACKAGE_LIBDAEMON=y
 # BR2_PACKAGE_LIBELF is not set
 # BR2_PACKAGE_LIBEVENT is not set
-# BR2_PACKAGE_LIBGLIB12 is not set
 BR2_PACKAGE_LIBGLIB2=y
 # BR2_PACKAGE_LIBOIL is not set
 # BR2_PACKAGE_STARTUP_NOTIFICATION is not set
diff --git a/configs/atstk1005_defconfig b/configs/atstk1005_defconfig
index d95b66638..48ea91598 100644
--- a/configs/atstk1005_defconfig
+++ b/configs/atstk1005_defconfig
@@ -537,7 +537,6 @@ BR2_PACKAGE_MTD_MTD_DEBUG=y
 # BR2_PACKAGE_MTD_SUMTOOL is not set
 # BR2_PACKAGE_NTFS-3G is not set
 # BR2_PACKAGE_PCIUTILS is not set
-# BR2_PACKAGE_PCMCIA is not set
 # BR2_PACKAGE_SETSERIAL is not set
 # BR2_PACKAGE_SMARTMONTOOLS is not set
 # BR2_PACKAGE_USBMOUNT is not set
@@ -632,7 +631,6 @@ BR2_PACKAGE_XSERVER_none=y
 # BR2_PACKAGE_PANGO is not set
 # BR2_PACKAGE_LIBDRM is not set
 # BR2_PACKAGE_LIBERATION is not set
-# BR2_PACKAGE_LIBGLIB12 is not set
 BR2_PACKAGE_LIBGLIB2=y
 # BR2_PACKAGE_OPENMOTIF is not set
 # BR2_PACKAGE_FONTCONFIG is not set
diff --git a/configs/atstk100x_defconfig b/configs/atstk100x_defconfig
index 3069f6a35..4be976721 100644
--- a/configs/atstk100x_defconfig
+++ b/configs/atstk100x_defconfig
@@ -544,7 +544,6 @@ BR2_PACKAGE_MTD_MTD_DEBUG=y
 # ntfs-3g requires a toolchain with LARGEFILE and WCHAR support
 #
 # BR2_PACKAGE_PCIUTILS is not set
-# BR2_PACKAGE_PCMCIA is not set
 # BR2_PACKAGE_SETSERIAL is not set
 # BR2_PACKAGE_SFDISK is not set
 # BR2_PACKAGE_SMARTMONTOOLS is not set
@@ -731,7 +730,6 @@ BR2_PACKAGE_XSERVER_none=y
 # BR2_PACKAGE_PANGO is not set
 # BR2_PACKAGE_LIBDRM is not set
 # BR2_PACKAGE_LIBERATION is not set
-# BR2_PACKAGE_LIBGLIB12 is not set
 BR2_PACKAGE_LIBGLIB2=y
 # BR2_PACKAGE_OPENMOTIF is not set
 # BR2_PACKAGE_FONTCONFIG is not set
diff --git a/configs/i386_defconfig b/configs/i386_defconfig
index e30ec3f55..7910511d0 100644
--- a/configs/i386_defconfig
+++ b/configs/i386_defconfig
@@ -484,7 +484,6 @@ BR2_PACKAGE_MTD_NFTLDUMP=y
 BR2_PACKAGE_MTD_SUMTOOL=y
 # BR2_PACKAGE_NTFS_3G is not set
 # BR2_PACKAGE_PCIUTILS is not set
-# BR2_PACKAGE_PCMCIA is not set
 # BR2_PACKAGE_SETSERIAL is not set
 # BR2_PACKAGE_SMARTMONTOOLS is not set
 # BR2_PACKAGE_USBMOUNT is not set
@@ -575,7 +574,6 @@ BR2_PACKAGE_XSERVER_none=y
 # BR2_PACKAGE_PANGO is not set
 # BR2_PACKAGE_LIBDRM is not set
 # BR2_PACKAGE_LIBERATION is not set
-# BR2_PACKAGE_LIBGLIB12 is not set
 # BR2_PACKAGE_LIBGLIB2 is not set
 # BR2_PACKAGE_OPENMOTIF is not set
 # BR2_PACKAGE_FONTCONFIG is not set
diff --git a/configs/i686_defconfig b/configs/i686_defconfig
index 916454db0..e75f1051d 100644
--- a/configs/i686_defconfig
+++ b/configs/i686_defconfig
@@ -484,7 +484,6 @@ BR2_PACKAGE_MTD_NFTLDUMP=y
 BR2_PACKAGE_MTD_SUMTOOL=y
 # BR2_PACKAGE_NTFS_3G is not set
 # BR2_PACKAGE_PCIUTILS is not set
-# BR2_PACKAGE_PCMCIA is not set
 # BR2_PACKAGE_SETSERIAL is not set
 # BR2_PACKAGE_SMARTMONTOOLS is not set
 # BR2_PACKAGE_USBMOUNT is not set
@@ -575,7 +574,6 @@ BR2_PACKAGE_XSERVER_none=y
 # BR2_PACKAGE_PANGO is not set
 # BR2_PACKAGE_LIBDRM is not set
 # BR2_PACKAGE_LIBERATION is not set
-# BR2_PACKAGE_LIBGLIB12 is not set
 # BR2_PACKAGE_LIBGLIB2 is not set
 # BR2_PACKAGE_OPENMOTIF is not set
 # BR2_PACKAGE_FONTCONFIG is not set
diff --git a/configs/integrator926_defconfig b/configs/integrator926_defconfig
index 3d82ba234..724b02515 100644
--- a/configs/integrator926_defconfig
+++ b/configs/integrator926_defconfig
@@ -471,7 +471,6 @@ BR2_PACKAGE_TCPDUMP=y
 # BR2_PACKAGE_MTD is not set
 # BR2_PACKAGE_NTFS-3G is not set
 BR2_PACKAGE_PCIUTILS=y
-# BR2_PACKAGE_PCMCIA is not set
 # BR2_PACKAGE_SETSERIAL is not set
 # BR2_PACKAGE_SMARTMONTOOLS is not set
 # BR2_PACKAGE_USBMOUNT is not set
@@ -573,7 +572,6 @@ BR2_PACKAGE_XSERVER_none=y
 # BR2_PACKAGE_PANGO is not set
 # BR2_PACKAGE_LIBDRM is not set
 # BR2_PACKAGE_LIBERATION is not set
-# BR2_PACKAGE_LIBGLIB12 is not set
 # BR2_PACKAGE_LIBGLIB2 is not set
 # BR2_PACKAGE_OPENMOTIF is not set
 # BR2_PACKAGE_FONTCONFIG is not set
diff --git a/configs/integrator926_huge_defconfig b/configs/integrator926_huge_defconfig
index ca133399b..2b20b0be9 100644
--- a/configs/integrator926_huge_defconfig
+++ b/configs/integrator926_huge_defconfig
@@ -453,7 +453,6 @@ BR2_PACKAGE_TCPDUMP=y
 # BR2_PACKAGE_MTD is not set
 # BR2_PACKAGE_NTFS-3G is not set
 BR2_PACKAGE_PCIUTILS=y
-# BR2_PACKAGE_PCMCIA is not set
 # BR2_PACKAGE_SETSERIAL is not set
 # BR2_PACKAGE_SMARTMONTOOLS is not set
 # BR2_PACKAGE_USBMOUNT is not set
@@ -552,7 +551,6 @@ BR2_PACKAGE_XSERVER_none=y
 # BR2_PACKAGE_PANGO is not set
 # BR2_PACKAGE_LIBDRM is not set
 # BR2_PACKAGE_LIBERATION is not set
-# BR2_PACKAGE_LIBGLIB12 is not set
 # BR2_PACKAGE_LIBGLIB2 is not set
 # BR2_PACKAGE_OPENMOTIF is not set
 # BR2_PACKAGE_FONTCONFIG is not set
diff --git a/configs/kb9202_defconfig b/configs/kb9202_defconfig
index 4f392abcd..ee2db69d1 100644
--- a/configs/kb9202_defconfig
+++ b/configs/kb9202_defconfig
@@ -473,7 +473,6 @@ BR2_BLOCKDEV_SUPPORT=y
 # BR2_PACKAGE_MTD is not set
 # BR2_PACKAGE_NTFS-3G is not set
 # BR2_PACKAGE_PCIUTILS is not set
-# BR2_PACKAGE_PCMCIA is not set
 # BR2_PACKAGE_RAIDTOOLS is not set
 # BR2_PACKAGE_SETSERIAL is not set
 # BR2_PACKAGE_SFDISK is not set
@@ -558,7 +557,6 @@ BR2_PACKAGE_XSERVER_none=y
 #
 # BR2_PACKAGE_PANGO is not set
 # BR2_PACKAGE_LIBDRM is not set
-# BR2_PACKAGE_LIBGLIB12 is not set
 # BR2_PACKAGE_LIBGLIB2 is not set
 # BR2_PACKAGE_LIBSEXY is not set
 
diff --git a/configs/v100sc2_defconfig b/configs/v100sc2_defconfig
index c82e7d7c7..f71a0d38f 100644
--- a/configs/v100sc2_defconfig
+++ b/configs/v100sc2_defconfig
@@ -574,7 +574,6 @@ BR2_PACKAGE_QT_OPENSSL=y
 # BR2_PACKAGE_PANGO is not set
 # BR2_PACKAGE_LIBDRM is not set
 # BR2_PACKAGE_LIBERATION is not set
-# BR2_PACKAGE_LIBGLIB12 is not set
 BR2_PACKAGE_LIBGLIB2=y
 # BR2_PACKAGE_OPENMOTIF is not set
 # BR2_PACKAGE_FONTCONFIG is not set