diff --git a/debian/changelog b/debian/changelog
index 3babf5d86..75dd59060 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,7 +17,7 @@ linux-2.6 (2.6.30~rc4-1~experimental.1) UNRELEASED; urgency=low
     SND_INDIGODJX, USB_SERIAL_CP210X, USB_SERIAL_QUALCOMM,
     USB_SERIAL_SYMBOL, ISL29003, SERIAL_MAX3100, VIDEO_HDPVR, VIDEO_CX231XX,
     DRAGONRISE_FF, LEDS_LP5521, LEDS_DAC124S085, LEDS_BD2802,
-    UIO_AEC, CRYPTO_ZLIB, REGULATOR_FIXED_VOLTAGE.
+    UIO_AEC, CRYPTO_ZLIB, REGULATOR_FIXED_VOLTAGE, NOP_USB_XCEIV.
 
   [ Ben Hutchings ]
   * Remove firmware from driver/staging (closes: #521553)
diff --git a/debian/config/config b/debian/config/config
index 4f854f34e..53c6c59b3 100644
--- a/debian/config/config
+++ b/debian/config/config
@@ -2089,6 +2089,11 @@ CONFIG_USB_SISUSBVGA_CON=y
 ##
 CONFIG_USB_MON=y
 
+##
+## file: drivers/usb/otg/Kconfig
+##
+CONFIG_NOP_USB_XCEIV=m
+
 ##
 ## file: drivers/usb/serial/Kconfig
 ##