--- a/drivers/usb/host/bcma-hcd.c
+++ b/drivers/usb/host/bcma-hcd.c
-@@ -45,7 +45,7 @@ static int bcma_wait_bits(struct bcma_de
+@@ -46,7 +46,7 @@ static int bcma_wait_bits(struct bcma_de
for (i = 0; i < timeout; i++) {
val = bcma_read32(dev, reg);
#define FB_ACCEL_NEOMAGIC_NM2093 92 /* NeoMagic NM2093 */
--- a/include/linux/Kbuild
+++ b/include/linux/Kbuild
-@@ -145,6 +145,8 @@ header-y += generic_serial.h
+@@ -144,6 +144,8 @@ header-y += generic_serial.h
header-y += genetlink.h
header-y += gfs2_ondisk.h
header-y += gigaset_dev.h