diff --git a/[refs] b/[refs] index b964b670d248..2e682862c43a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3b8861715a9c17151e24f03e4ab2c30e6d8a0748 +refs/heads/master: c41107c2d4fd31924533f4dbc4c3428acc2b5894 diff --git a/trunk/arch/arm/mach-sa1100/Makefile b/trunk/arch/arm/mach-sa1100/Makefile index 8e0244631d65..8a5546e6d547 100644 --- a/trunk/arch/arm/mach-sa1100/Makefile +++ b/trunk/arch/arm/mach-sa1100/Makefile @@ -46,9 +46,6 @@ led-$(CONFIG_SA1100_SIMPAD) += leds-simpad.o # LEDs support obj-$(CONFIG_LEDS) += $(led-y) -# SA1110 USB client support -#obj-$(CONFIG_SA1100_USB) += usb/ - # Miscelaneous functions obj-$(CONFIG_PM) += pm.o sleep.o obj-$(CONFIG_SA1100_SSP) += ssp.o